From f7597331a908fb9e116e2fc57a207b3b21e3480e Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 31 Jan 2010 15:07:49 +0000 Subject: [amazon] Apply patch 200-fix_deprecated_interrupt_definations.patch directly git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19454 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/amazon/files/arch/mips/amazon/dma-core.c | 2 +- target/linux/amazon/files/arch/mips/amazon/interrupt.c | 2 +- target/linux/amazon/files/arch/mips/amazon/setup.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/amazon/files/arch') diff --git a/target/linux/amazon/files/arch/mips/amazon/dma-core.c b/target/linux/amazon/files/arch/mips/amazon/dma-core.c index 242bc77af2..6362895f87 100644 --- a/target/linux/amazon/files/arch/mips/amazon/dma-core.c +++ b/target/linux/amazon/files/arch/mips/amazon/dma-core.c @@ -1387,7 +1387,7 @@ static int dma_init(void) AMAZON_DMA_EMSG("cannot register device dma-core!\n"); return result; } - result = request_irq(AMAZON_DMA_INT, dma_interrupt, SA_INTERRUPT, "dma-core", (void *) &dma_interrupt); + result = request_irq(AMAZON_DMA_INT, dma_interrupt, IRQF_DISABLED, "dma-core", (void *) &dma_interrupt); if (result) { AMAZON_DMA_EMSG("error, cannot get dma_irq!\n"); free_irq(AMAZON_DMA_INT, (void *) &dma_interrupt); diff --git a/target/linux/amazon/files/arch/mips/amazon/interrupt.c b/target/linux/amazon/files/arch/mips/amazon/interrupt.c index 5e34e0577b..e61ccdfc3d 100644 --- a/target/linux/amazon/files/arch/mips/amazon/interrupt.c +++ b/target/linux/amazon/files/arch/mips/amazon/interrupt.c @@ -157,7 +157,7 @@ out: static struct irqaction cascade = { .handler = no_action, - .flags = SA_INTERRUPT, + .flags = IRQF_DISABLED, .name = "cascade", }; diff --git a/target/linux/amazon/files/arch/mips/amazon/setup.c b/target/linux/amazon/files/arch/mips/amazon/setup.c index 45ff2544fc..8c3c86c0fa 100644 --- a/target/linux/amazon/files/arch/mips/amazon/setup.c +++ b/target/linux/amazon/files/arch/mips/amazon/setup.c @@ -107,7 +107,7 @@ static void amazon_timer6_interrupt(int irq, void *dev_id) static struct irqaction hrt_irqaction = { .handler = amazon_timer6_interrupt, - .flags = SA_INTERRUPT, + .flags = IRQF_DISABLED, .name = "hrt", }; -- cgit v1.2.3