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-sparc64/idprom.h | |
| 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-sparc64/idprom.h')
| -rw-r--r-- | include/asm-sparc64/idprom.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/include/asm-sparc64/idprom.h b/include/asm-sparc64/idprom.h index a363fa0a112a..c22f9c30bc78 100644 --- a/include/asm-sparc64/idprom.h +++ b/include/asm-sparc64/idprom.h @@ -1,25 +1 @@ -/* - * idprom.h: Macros and defines for idprom routines - * - * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) - */ - -#ifndef _SPARC64_IDPROM_H -#define _SPARC64_IDPROM_H - -#include <linux/types.h> - -struct idprom { - u8 id_format; /* Format identifier (always 0x01) */ - u8 id_machtype; /* Machine type */ - u8 id_ethaddr[6]; /* Hardware ethernet address */ - s32 id_date; /* Date of manufacture */ - u32 id_sernum:24; /* Unique serial number */ - u8 id_cksum; /* Checksum - xor of the data bytes */ - u8 reserved[16]; -}; - -extern struct idprom *idprom; -extern void idprom_init(void); - -#endif /* !(_SPARC_IDPROM_H) */ +#include <asm-sparc/idprom.h> |