diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-01-31 15:07:49 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-01-31 15:07:49 +0000 |
| commit | 038f0e6bbef7c352ffbd1abecbfeafb11d79d1e5 (patch) | |
| tree | c972733bb69d0f7950080bf64bba8c7a3daea7c2 /target/linux/amazon/files | |
| parent | b6a1293e1e41508ee7a4e4b2fd3a0b1fd08337eb (diff) | |
| download | upstream-038f0e6bbef7c352ffbd1abecbfeafb11d79d1e5.tar.gz upstream-038f0e6bbef7c352ffbd1abecbfeafb11d79d1e5.tar.bz2 upstream-038f0e6bbef7c352ffbd1abecbfeafb11d79d1e5.zip | |
Apply patch 200-fix_deprecated_interrupt_definations.patch directly
SVN-Revision: 19454
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; } |