From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 31 Jan 2010 15:09:48 +0000 (+0000)
Subject: [amazon] Apply patch 240-irq_fix.patch directly
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=4364291305eaada45645001b19a2a8fe548e364c

[amazon] Apply patch 240-irq_fix.patch directly


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19457 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/amazon/files/arch/mips/amazon/interrupt.c b/target/linux/amazon/files/arch/mips/amazon/interrupt.c
index 17980fb11..4746f1247 100644
--- a/target/linux/amazon/files/arch/mips/amazon/interrupt.c
+++ b/target/linux/amazon/files/arch/mips/amazon/interrupt.c
@@ -177,12 +177,11 @@ void __init arch_init_irq(void)
 		setup_irq(i, &cascade);
 	}
 
-	for (i = INT_NUM_IRQ0; i <= INT_NUM_IM4_IRL31; i++) {
-		irq_desc[i].status	= IRQ_DISABLED;
-		irq_desc[i].action	= 0;
-		irq_desc[i].depth	= 1;
-		set_irq_chip(i, &amazon_irq_type);
-	}
+	for (i = INT_NUM_IRQ0; i <= INT_NUM_IM4_IRL31; i++)
+		set_irq_chip_and_handler(i, &amazon_irq_type,
+			handle_level_irq);
+
+	set_c0_status(IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5);
 }
 
 void __cpuinit arch_fixup_c0_irqs(void)
diff --git a/target/linux/amazon/patches-2.6.30/240-irq_fix.patch b/target/linux/amazon/patches-2.6.30/240-irq_fix.patch
deleted file mode 100644
index 151f1b4fc..000000000
--- a/target/linux/amazon/patches-2.6.30/240-irq_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/arch/mips/amazon/interrupt.c
-+++ b/arch/mips/amazon/interrupt.c
-@@ -177,12 +177,11 @@ void __init arch_init_irq(void)
- 		setup_irq(i, &cascade);
- 	}
- 
--	for (i = INT_NUM_IRQ0; i <= INT_NUM_IM4_IRL31; i++) {
--		irq_desc[i].status	= IRQ_DISABLED;
--		irq_desc[i].action	= 0;
--		irq_desc[i].depth	= 1;
--		set_irq_chip(i, &amazon_irq_type);
--	}
-+	for (i = INT_NUM_IRQ0; i <= INT_NUM_IM4_IRL31; i++)
-+		set_irq_chip_and_handler(i, &amazon_irq_type,
-+			handle_level_irq);
-+
-+	set_c0_status(IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5);
- }
- 
- void __cpuinit arch_fixup_c0_irqs(void)