Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2bbc5bdfb165521b28ca1825ea482557bffd3918
Commit: 2bbc5bdfb165521b28ca1825ea482557bffd3918
Parent: 2f3643aecd1e4e6a4c34cb32eb0410340f34e97f
Author: Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 11 04:07:40 2006 +0000
Committer: Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Tue Dec 12 01:46:24 2006 +0000
[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 <[EMAIL PROTECTED]>
---
include/asm-mips/sn/arch.h | 1 -
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 51174af..da523de 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 15d70ca..82aeb9e 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
