diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-02 20:20:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 20:29:22 -0400 |
commit | 52e405eaa9806968e88b35d65e57acad954a5ab5 (patch) | |
tree | b42e2d50c4f9d1b00baf5a8b54309ffdf1950456 /arch/arm/mach-pxa/lubbock.c | |
parent | d061daa0e3abdddc28e21a37c8ac4536dedbf239 (diff) |
[PATCH] ARM: fixup irqflags breakage after ARM genirq merge
The irgflags consolidation did conflict with the ARM to generic IRQ
conversion and was not applied for ARM. Fix it up.
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-pxa/lubbock.c')
-rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index 1ab26c6914f2..6a9a669d60de 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
@@ -419,7 +419,7 @@ static int lubbock_mci_init(struct device *dev, | |||
419 | init_timer(&mmc_timer); | 419 | init_timer(&mmc_timer); |
420 | mmc_timer.data = (unsigned long) data; | 420 | mmc_timer.data = (unsigned long) data; |
421 | return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int, | 421 | return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int, |
422 | SA_SAMPLE_RANDOM, "lubbock-sd-detect", data); | 422 | IRQF_SAMPLE_RANDOM, "lubbock-sd-detect", data); |
423 | } | 423 | } |
424 | 424 | ||
425 | static int lubbock_mci_get_ro(struct device *dev) | 425 | static int lubbock_mci_get_ro(struct device *dev) |