diff options
| author | Michael Opdenacker <michael@free-electrons.com> | 2014-03-04 15:59:03 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-03-12 06:32:33 -0400 |
| commit | 1ee6564d72ce718bf4e50d5684aa98d9d895f859 (patch) | |
| tree | 48604cb661d2f025e5e2b1d190b6de708621fc9b /arch/arm/mach-ixp4xx/nas100d-setup.c | |
| parent | 19bd9b286da6f28f4cb04757dd8509a38f9f34d7 (diff) | |
ARM: 7998/1: IXP4xx: remove deprecated IRQF_DISABLED
This patch removes the use of the IRQF_DISABLED flag
from code in arch/arm/mach-ixp4xx
It's a NOOP since 2.6.35 and it will be removed one day.
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp4xx/nas100d-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nas100d-setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c index 507cb5233537..4e0f762bc651 100644 --- a/arch/arm/mach-ixp4xx/nas100d-setup.c +++ b/arch/arm/mach-ixp4xx/nas100d-setup.c | |||
| @@ -295,8 +295,7 @@ static void __init nas100d_init(void) | |||
| 295 | pm_power_off = nas100d_power_off; | 295 | pm_power_off = nas100d_power_off; |
| 296 | 296 | ||
| 297 | if (request_irq(gpio_to_irq(NAS100D_RB_GPIO), &nas100d_reset_handler, | 297 | if (request_irq(gpio_to_irq(NAS100D_RB_GPIO), &nas100d_reset_handler, |
| 298 | IRQF_DISABLED | IRQF_TRIGGER_LOW, | 298 | IRQF_TRIGGER_LOW, "NAS100D reset button", NULL) < 0) { |
| 299 | "NAS100D reset button", NULL) < 0) { | ||
| 300 | 299 | ||
| 301 | printk(KERN_DEBUG "Reset Button IRQ %d not available\n", | 300 | printk(KERN_DEBUG "Reset Button IRQ %d not available\n", |
| 302 | gpio_to_irq(NAS100D_RB_GPIO)); | 301 | gpio_to_irq(NAS100D_RB_GPIO)); |