diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
commit | ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (patch) | |
tree | d498e947176f4b77938034ff6c6427f9875da721 /include/asm-m68k/idprom.h | |
parent | 9f4863b7dc7f545bb3a01746feafdc1208e86c89 (diff) | |
parent | 49148020bcb6910ce71417bd990a5ce7017f9bd3 (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k,m68knommu: merge header files
Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild
Diffstat (limited to 'include/asm-m68k/idprom.h')
-rw-r--r-- | include/asm-m68k/idprom.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/include/asm-m68k/idprom.h b/include/asm-m68k/idprom.h deleted file mode 100644 index 160616a89e0..00000000000 --- a/include/asm-m68k/idprom.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _M68K_IDPROM_H -#define _M68K_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 - -#endif /* !(_M68K_IDPROM_H) */ |