diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-19 16:39:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 00:45:02 -0400 |
| commit | 5e3609f60c09f0f15f71f80c6d7933b2c7be71a6 (patch) | |
| tree | cae8f8c2f446b7e979b1763d78af19a025ab756f /include/asm-sparc/idprom.h | |
| parent | 075ae525327ed789f5b755a8042ee6f3a0e2ab7b (diff) | |
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/idprom.h')
| -rw-r--r-- | include/asm-sparc/idprom.h | 2 |
1 files changed, 1 insertions, 1 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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * idprom.h: Macros and defines for idprom routines | 2 | * idprom.h: Macros and defines for idprom routines |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #ifndef _SPARC_IDPROM_H | 7 | #ifndef _SPARC_IDPROM_H |