diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 19:29:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 13:58:49 -0700 |
| commit | 69ab3912d1b4dbf27ea1a383cb5731251fc0e109 (patch) | |
| tree | d0e68c828d8f49483d4bfaccbe4d98c1b339ee94 /drivers/block/ps2esdi.c | |
| parent | 3cca53b02a5bab0f407b1add2f84c22c20243a79 (diff) | |
| download | op-kernel-dev-69ab3912d1b4dbf27ea1a383cb5731251fc0e109.zip op-kernel-dev-69ab3912d1b4dbf27ea1a383cb5731251fc0e109.tar.gz | |
[PATCH] irq-flags: drivers/block Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block/ps2esdi.c')
| -rw-r--r-- | drivers/block/ps2esdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c index aef5a0c..5537974 100644 --- a/drivers/block/ps2esdi.c +++ b/drivers/block/ps2esdi.c @@ -340,9 +340,9 @@ static int __init ps2esdi_geninit(void) /* try to grab IRQ, and try to grab a slow IRQ if it fails, so we can share with the SCSI driver */ if (request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler, - SA_INTERRUPT | SA_SHIRQ, "PS/2 ESDI", &ps2esdi_gendisk) + IRQF_DISABLED | IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk) && request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler, - SA_SHIRQ, "PS/2 ESDI", &ps2esdi_gendisk) + IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk) ) { printk("%s: Unable to get IRQ %d\n", DEVICE_NAME, PS2ESDI_IRQ); error = -EBUSY; |
