Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / include / asm-mips / sn / arch.h

diff --git a/include/asm-mips/sn/arch.h b/include/asm-mips/sn/arch.h
index 51174af6ac5213608f3f85a0ecc90749adabe421..da523de628be98302df8d306f7ddf3666a6907dd 100644 (file)
--- 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)