diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-03 16:02:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 20:16:20 -0400 |
commit | 7274264f60cc0b71389efed286001ff0860c3141 (patch) | |
tree | ceae2181feb9215091db3127d6918b8ce4420f52 /include/asm-m68k/idprom.h | |
parent | 725aad24c3ba96a7c06448c14c265a466cdbd663 (diff) |
m68k: some asm-sparc include files moved
So copy their contents into the asm-m68k files.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-m68k/idprom.h')
-rw-r--r-- | include/asm-m68k/idprom.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/include/asm-m68k/idprom.h b/include/asm-m68k/idprom.h index 4349eaf3cfe4..160616a89e05 100644 --- a/include/asm-m68k/idprom.h +++ b/include/asm-m68k/idprom.h | |||
@@ -1,6 +1,25 @@ | |||
1 | #ifndef _M68K_IDPROM_H | 1 | #ifndef _M68K_IDPROM_H |
2 | #define _M68K_IDPROM_H | 2 | #define _M68K_IDPROM_H |
3 | #include <asm-sparc/idprom.h> | 3 | /* |
4 | * idprom.h: Macros and defines for idprom routines | ||
5 | * | ||
6 | * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) | ||
7 | */ | ||
8 | |||
9 | #include <linux/types.h> | ||
10 | |||
11 | struct idprom { | ||
12 | u8 id_format; /* Format identifier (always 0x01) */ | ||
13 | u8 id_machtype; /* Machine type */ | ||
14 | u8 id_ethaddr[6]; /* Hardware ethernet address */ | ||
15 | s32 id_date; /* Date of manufacture */ | ||
16 | u32 id_sernum:24; /* Unique serial number */ | ||
17 | u8 id_cksum; /* Checksum - xor of the data bytes */ | ||
18 | u8 reserved[16]; | ||
19 | }; | ||
20 | |||
21 | extern struct idprom *idprom; | ||
22 | extern void idprom_init(void); | ||
4 | 23 | ||
5 | /* Sun3: in control space */ | 24 | /* Sun3: in control space */ |
6 | #define SUN3_IDPROM_BASE 0x00000000 | 25 | #define SUN3_IDPROM_BASE 0x00000000 |