summaryrefslogtreecommitdiff
path: root/drivers/staging/meilhaus/me4600_ao.c
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2009-05-09 09:40:14 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 11:00:35 -0700
commit152cc3975353961e66ead09ee8e15ad3a82c2670 (patch)
treed6a47797543054a250ab6792aef9c65f545beac5 /drivers/staging/meilhaus/me4600_ao.c
parentdd96864204959c6bb707dfb8ab6f109b65cbf414 (diff)
Staging: meilhaus: Remove long-deprecated SA_* interrupt macros.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/meilhaus/me4600_ao.c')
-rw-r--r--drivers/staging/meilhaus/me4600_ao.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/meilhaus/me4600_ao.c b/drivers/staging/meilhaus/me4600_ao.c
index eb472692a7c5..4000dac057ed 100644
--- a/drivers/staging/meilhaus/me4600_ao.c
+++ b/drivers/staging/meilhaus/me4600_ao.c
@@ -2567,11 +2567,7 @@ me4600_ao_subdevice_t *me4600_ao_constructor(uint32_t reg_base,
if (subdevice->fifo) {
subdevice->irq = irq;
if (request_irq(subdevice->irq, me4600_ao_isr,
-#ifdef IRQF_DISABLED
IRQF_DISABLED | IRQF_SHARED,
-#else
- SA_INTERRUPT | SA_SHIRQ,
-#endif
ME4600_NAME, subdevice)) {
PERROR("Cannot get interrupt line.\n");
PDEBUG("free circ_buf = %p size=%d",
@@ -5737,7 +5733,7 @@ me4600_ao_subdevice_t *me4600_ao_constructor(uint32_t reg_base,
subdevice->irq = irq;
if (request_irq
- (subdevice->irq, me4600_ao_isr, SA_INTERRUPT | SA_SHIRQ,
+ (subdevice->irq, me4600_ao_isr, IRQF_DISABLED | IRQF_SHARED,
ME4600_NAME, subdevice)) {
PERROR("Cannot get interrupt line.\n");
me_subdevice_deinit((me_subdevice_t *) subdevice);