diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-31 15:07:49 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-31 15:07:49 +0000 |
| commit | f7597331a908fb9e116e2fc57a207b3b21e3480e (patch) | |
| tree | acc986655ce5ec70091161e669b79c6014179242 /target/linux/amazon/files | |
| parent | a276d0b61b71916bf71ca9ae054c0fd3c1f60f24 (diff) | |
[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
Diffstat (limited to 'target/linux/amazon/files')
4 files changed, 7 insertions, 7 deletions
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", }; diff --git a/target/linux/amazon/files/drivers/atm/amazon_tpe.c b/target/linux/amazon/files/drivers/atm/amazon_tpe.c index cf3e407329..b507494407 100644 --- a/target/linux/amazon/files/drivers/atm/amazon_tpe.c +++ b/target/linux/amazon/files/drivers/atm/amazon_tpe.c @@ -2404,13 +2404,13 @@ amazon_atm_dev_t * amazon_atm_create(void) // Register interrupts for insertion and extraction - request_irq(AMAZON_SWIE_INT, amazon_atm_swie_isr, SA_INTERRUPT, "tpe_swie", NULL); - request_irq(AMAZON_CBM_INT, amazon_atm_cbm_isr, SA_INTERRUPT, "tpe_cbm", NULL); + request_irq(AMAZON_SWIE_INT, amazon_atm_swie_isr, IRQF_DISABLED, "tpe_swie", NULL); + request_irq(AMAZON_CBM_INT, amazon_atm_cbm_isr, IRQF_DISABLED, "tpe_cbm", NULL); #ifdef AMAZON_ATM_DEBUG - request_irq(AMAZON_HTU_INT , amazon_atm_htu_isr, SA_INTERRUPT, "tpe_htu", NULL); + request_irq(AMAZON_HTU_INT , amazon_atm_htu_isr, IRQF_DISABLED, "tpe_htu", NULL); #endif #ifdef AMAZON_TPE_TEST_AAL5_INT - request_irq(AMAZON_AAL5_INT, amazon_atm_aal5_isr, SA_INTERRUPT, "tpe_aal5", NULL); + request_irq(AMAZON_AAL5_INT, amazon_atm_aal5_isr, IRQF_DISABLED, "tpe_aal5", NULL); #endif return &g_atm_dev; } |