summaryrefslogtreecommitdiff
path: root/target/linux/aruba-2.6/patches/000-aruba.patch
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-20 00:24:18 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-20 00:24:18 +0000
commit7ef9fcd381a2830288adf10d3546ff16b4b2680e (patch)
tree5b1de4896bda934a8ba205b2daca4684294e9796 /target/linux/aruba-2.6/patches/000-aruba.patch
parenta754e7fb097a979b4fc6745e54cbe5695f604787 (diff)
fix irq handling on 2.6.17
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4017 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/aruba-2.6/patches/000-aruba.patch')
-rw-r--r--target/linux/aruba-2.6/patches/000-aruba.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/aruba-2.6/patches/000-aruba.patch b/target/linux/aruba-2.6/patches/000-aruba.patch
index 83f023cfe0..b9e602be4e 100644
--- a/target/linux/aruba-2.6/patches/000-aruba.patch
+++ b/target/linux/aruba-2.6/patches/000-aruba.patch
@@ -45,7 +45,7 @@ diff -Nur linux-2.6.17/arch/mips/aruba/Makefile linux-2.6.17-owrt/arch/mips/arub
+# .S.o:
+# $(CC) $(CFLAGS) -c $< -o $*.o
+
-+obj-y := prom.o setup.o idtIRQ.o irq.o time.o flash_lock.o
++obj-y := prom.o setup.o irq.o time.o flash_lock.o
+obj-$(CONFIG_SERIAL_8250) += serial.o
+
+subdir-y += nvram
@@ -921,7 +921,7 @@ diff -Nur linux-2.6.17/arch/mips/aruba/setup.c linux-2.6.17-owrt/arch/mips/aruba
diff -Nur linux-2.6.17/arch/mips/aruba/time.c linux-2.6.17-owrt/arch/mips/aruba/time.c
--- linux-2.6.17/arch/mips/aruba/time.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.17-owrt/arch/mips/aruba/time.c 2006-06-18 12:44:28.000000000 +0200
-@@ -0,0 +1,108 @@
+@@ -0,0 +1,110 @@
+/**************************************************************************
+ *
+ * BRIEF MODULE DESCRIPTION
@@ -1022,8 +1022,10 @@ diff -Nur linux-2.6.17/arch/mips/aruba/time.c linux-2.6.17-owrt/arch/mips/aruba/
+
+}
+
-+asmlinkage void aruba_timer_interrupt(int irq, struct pt_regs *regs)
++asmlinkage void aruba_timer_interrupt(struct pt_regs *regs)
+{
++ int irq = MIPS_CPU_TIMER_IRQ;
++
+ irq_enter();
+ kstat_this_cpu.irqs[irq]++;
+