]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
[MIPS] Fix double inclusions
authorNicolas Kaiser <nikai@nikai.net>
Tue, 7 Nov 2006 08:56:24 +0000 (09:56 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 30 Nov 2006 01:14:47 +0000 (01:14 +0000)
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/signal_n32.c
arch/mips/mips-boards/sim/sim_time.c
arch/mips/sibyte/bcm1480/time.c
arch/mips/tx4938/common/setup.c

index 477c5334ec1b459eefb010c9ef5918ca1358b47b..a67c18555ed396cdb2c08443a1808dd2d39bda94 100644 (file)
@@ -17,7 +17,6 @@
  */
 #include <linux/cache.h>
 #include <linux/sched.h>
-#include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
index f2d998d2c169dc137084df7b5f469e4ded65be34..30711d016fed008a7520b1341e32c0d81fbf2ccb 100644 (file)
@@ -3,31 +3,24 @@
 #include <linux/kernel_stat.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
-
-#include <asm/mipsregs.h>
-#include <asm/ptrace.h>
-#include <asm/hardirq.h>
-#include <asm/div64.h>
-#include <asm/cpu.h>
-#include <asm/time.h>
-
 #include <linux/interrupt.h>
 #include <linux/mc146818rtc.h>
 #include <linux/timex.h>
+
 #include <asm/mipsregs.h>
+#include <asm/ptrace.h>
 #include <asm/hardirq.h>
-#include <asm/irq.h>
 #include <asm/div64.h>
 #include <asm/cpu.h>
 #include <asm/time.h>
+#include <asm/irq.h>
 #include <asm/mc146818-time.h>
 #include <asm/msc01_ic.h>
+#include <asm/smp.h>
 
 #include <asm/mips-boards/generic.h>
 #include <asm/mips-boards/prom.h>
 #include <asm/mips-boards/simint.h>
-#include <asm/mc146818-time.h>
-#include <asm/smp.h>
 
 
 unsigned long cpu_khz;
index e136bde5248ec607c286dc3b4ece45440543f7a4..03d5822d3a736fac44207379e974903ab0e47f27 100644 (file)
@@ -94,8 +94,6 @@ void bcm1480_time_init(void)
         */
 }
 
-#include <asm/sibyte/sb1250.h>
-
 void bcm1480_timer_interrupt(void)
 {
        int cpu = smp_processor_id();
index f415a1f18fba657c350c09c6ead11d0571e411ac..dc87d92bb08d267a4119d96b417e9b9a4588b2db 100644 (file)
@@ -31,7 +31,6 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/time.h>
 #include <asm/tx4938/rbtx4938.h>
 
 extern void toshiba_rbtx4938_setup(void);