diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /arch/sparc/include/asm/idprom.h | |
parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/include/asm/idprom.h')
-rw-r--r-- | arch/sparc/include/asm/idprom.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/idprom.h b/arch/sparc/include/asm/idprom.h new file mode 100644 index 000000000000..6976aa2439c6 --- /dev/null +++ b/arch/sparc/include/asm/idprom.h | |||
@@ -0,0 +1,25 @@ | |||
1 | /* | ||
2 | * idprom.h: Macros and defines for idprom routines | ||
3 | * | ||
4 | * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) | ||
5 | */ | ||
6 | |||
7 | #ifndef _SPARC_IDPROM_H | ||
8 | #define _SPARC_IDPROM_H | ||
9 | |||
10 | #include <linux/types.h> | ||
11 | |||
12 | struct idprom { | ||
13 | u8 id_format; /* Format identifier (always 0x01) */ | ||
14 | u8 id_machtype; /* Machine type */ | ||
15 | u8 id_ethaddr[6]; /* Hardware ethernet address */ | ||
16 | s32 id_date; /* Date of manufacture */ | ||
17 | u32 id_sernum:24; /* Unique serial number */ | ||
18 | u8 id_cksum; /* Checksum - xor of the data bytes */ | ||
19 | u8 reserved[16]; | ||
20 | }; | ||
21 | |||
22 | extern struct idprom *idprom; | ||
23 | extern void idprom_init(void); | ||
24 | |||
25 | #endif /* !(_SPARC_IDPROM_H) */ | ||