diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-12-11 04:07:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-12-12 01:46:24 +0000 |
| commit | 2bbc5bdfb165521b28ca1825ea482557bffd3918 (patch) | |
| tree | cf5ae093e894f33e388330fb9cd3597d7fe10485 /include | |
| parent | 2f3643aecd1e4e6a4c34cb32eb0410340f34e97f (diff) | |
| download | talos-obmc-linux-2bbc5bdfb165521b28ca1825ea482557bffd3918.tar.gz talos-obmc-linux-2bbc5bdfb165521b28ca1825ea482557bffd3918.zip | |
[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>
Diffstat (limited to 'include')
| -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 @@ #endif typedef u64 hubreg_t; -typedef u64 nic_t; #define cputonasid(cpu) (cpu_data[(cpu)].p_nasid) #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 @@ #endif /* CONFIG_SGI_IP35 */ #endif /* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */ +typedef u64 nic_t; + #define KLCFGINFO_MAGIC 0xbeedbabe typedef s32 klconf_off_t; |
