diff options
| author |   Sam Ravnborg <sam@ravnborg.org> | 2008-06-19 22:39:00 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-07-17 21:45:02 -0700 |
| commit | 5e3609f60c09f0f15f71f80c6d7933b2c7be71a6 (patch) | |
| tree | cae8f8c2f446b7e979b1763d78af19a025ab756f /include/asm-sparc | |
| parent | sparc: when header files are equal use asm-sparc version (diff) | |
| download | linux-dev-5e3609f60c09f0f15f71f80c6d7933b2c7be71a6.tar.xz linux-dev-5e3609f60c09f0f15f71f80c6d7933b2c7be71a6.zip | |
sparc: merge header files with trivial differences
A manual inspection revealed that the following headerfiles
contained only trivial differences:
hw_irq.h idprom.h kmap_types.h kvm.h spinlock_types.h sunbpp.h unaligned.h
The only noteworthy change are that sparc64 had a volatile
qualifer that sparc missed in spinlock_types.h.
In addition a few comments were updated.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/idprom.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc/kmap_types.h | 4 | ||||
| -rw-r--r-- | include/asm-sparc/spinlock_types.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-sparc/idprom.h b/include/asm-sparc/idprom.h index 41adb417a4e5..6976aa2439c6 100644 --- a/include/asm-sparc/idprom.h +++ b/include/asm-sparc/idprom.h @@ -1,7 +1,7 @@ /* * idprom.h: Macros and defines for idprom routines * - * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) + * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) */ #ifndef _SPARC_IDPROM_H diff --git a/include/asm-sparc/kmap_types.h b/include/asm-sparc/kmap_types.h index e215f7104974..602f5e034f7a 100644 --- a/include/asm-sparc/kmap_types.h +++ b/include/asm-sparc/kmap_types.h @@ -1,6 +1,10 @@ #ifndef _ASM_KMAP_TYPES_H #define _ASM_KMAP_TYPES_H +/* Dummy header just to define km_type. None of this + * is actually used on sparc. -DaveM + */ + enum km_type { KM_BOUNCE_READ, KM_SKB_SUNRPC_DATA, diff --git a/include/asm-sparc/spinlock_types.h b/include/asm-sparc/spinlock_types.h index 0a0fb116c4ec..37cbe01c585b 100644 --- a/include/asm-sparc/spinlock_types.h +++ b/include/asm-sparc/spinlock_types.h @@ -6,7 +6,7 @@ #endif typedef struct { - unsigned char lock; + volatile unsigned char lock; } raw_spinlock_t; #define __RAW_SPIN_LOCK_UNLOCKED { 0 } |