diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-03 22:02:10 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:16:20 -0700 |
commit | 7274264f60cc0b71389efed286001ff0860c3141 (patch) | |
tree | ceae2181feb9215091db3127d6918b8ce4420f52 /include/asm-m68k/idprom.h | |
parent | 725aad24c3ba96a7c06448c14c265a466cdbd663 (diff) | |
download | op-kernel-dev-7274264f60cc0b71389efed286001ff0860c3141.zip op-kernel-dev-7274264f60cc0b71389efed286001ff0860c3141.tar.gz |
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 4349eaf..160616a 100644 --- a/include/asm-m68k/idprom.h +++ b/include/asm-m68k/idprom.h @@ -1,6 +1,25 @@ #ifndef _M68K_IDPROM_H #define _M68K_IDPROM_H -#include <asm-sparc/idprom.h> +/* + * idprom.h: Macros and defines for idprom routines + * + * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) + */ + +#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); /* Sun3: in control space */ #define SUN3_IDPROM_BASE 0x00000000 |