diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-12-10 23:07:40 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-12-11 20:46:24 -0500 |
commit | 2bbc5bdfb165521b28ca1825ea482557bffd3918 (patch) | |
tree | cf5ae093e894f33e388330fb9cd3597d7fe10485 | |
parent | 2f3643aecd1e4e6a4c34cb32eb0410340f34e97f (diff) |
[MIPS] IP27: Move definition of nic_t to its sole user.
This also fixes the duplicate definition of nic_t in the s2io driver.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | include/asm-mips/sn/arch.h | 1 | ||||
-rw-r--r-- | include/asm-mips/sn/klconfig.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-mips/sn/arch.h b/include/asm-mips/sn/arch.h index 51174af6ac52..da523de628be 100644 --- a/include/asm-mips/sn/arch.h +++ b/include/asm-mips/sn/arch.h | |||
@@ -18,7 +18,6 @@ | |||
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | typedef u64 hubreg_t; | 20 | typedef u64 hubreg_t; |
21 | typedef u64 nic_t; | ||
22 | 21 | ||
23 | #define cputonasid(cpu) (cpu_data[(cpu)].p_nasid) | 22 | #define cputonasid(cpu) (cpu_data[(cpu)].p_nasid) |
24 | #define cputoslice(cpu) (cpu_data[(cpu)].p_slice) | 23 | #define cputoslice(cpu) (cpu_data[(cpu)].p_slice) |
diff --git a/include/asm-mips/sn/klconfig.h b/include/asm-mips/sn/klconfig.h index 15d70ca56187..82aeb9e322db 100644 --- a/include/asm-mips/sn/klconfig.h +++ b/include/asm-mips/sn/klconfig.h | |||
@@ -61,6 +61,8 @@ | |||
61 | #endif /* CONFIG_SGI_IP35 */ | 61 | #endif /* CONFIG_SGI_IP35 */ |
62 | #endif /* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */ | 62 | #endif /* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */ |
63 | 63 | ||
64 | typedef u64 nic_t; | ||
65 | |||
64 | #define KLCFGINFO_MAGIC 0xbeedbabe | 66 | #define KLCFGINFO_MAGIC 0xbeedbabe |
65 | 67 | ||
66 | typedef s32 klconf_off_t; | 68 | typedef s32 klconf_off_t; |