5 files changed, 7 insertions, 13 deletions

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 12c71a4a42a0..be882c95bd36 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -311,7 +311,7 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id)
 
 static struct irqaction ixp4xx_timer_irq = {
         .name           = "timer1",
-        .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+        .flags          = IRQF_TIMER | IRQF_IRQPOLL,
         .handler        = ixp4xx_timer_interrupt,
         .dev_id         = &clockevent_ixp4xx,
 };
diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
index 736dc692d540..43ee06d3abe5 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -233,8 +233,7 @@ static int __init dsmg600_gpio_init(void)
 
         gpio_request(DSMG600_RB_GPIO, "reset button");
         if (request_irq(gpio_to_irq(DSMG600_RB_GPIO), &dsmg600_reset_handler,
-                IRQF_DISABLED | IRQF_TRIGGER_LOW,
-                "DSM-G600 reset button", NULL) < 0) {
+                IRQF_TRIGGER_LOW, "DSM-G600 reset button", NULL) < 0) {
 
                 printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
                         gpio_to_irq(DSMG600_RB_GPIO));
diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
index 429966b756ed..5c4b0c4a1b37 100644
--- a/arch/arm/mach-ixp4xx/fsg-setup.c
+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -208,16 +208,14 @@ static void __init fsg_init(void)
         platform_add_devices(fsg_devices, ARRAY_SIZE(fsg_devices));
 
         if (request_irq(gpio_to_irq(FSG_RB_GPIO), &fsg_reset_handler,
-                        IRQF_DISABLED | IRQF_TRIGGER_LOW,
-                        "FSG reset button", NULL) < 0) {
+                        IRQF_TRIGGER_LOW, "FSG reset button", NULL) < 0) {
 
                 printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
                         gpio_to_irq(FSG_RB_GPIO));
         }
 
         if (request_irq(gpio_to_irq(FSG_SB_GPIO), &fsg_power_handler,
-                        IRQF_DISABLED | IRQF_TRIGGER_LOW,
-                        "FSG power button", NULL) < 0) {
+                        IRQF_TRIGGER_LOW, "FSG power button", NULL) < 0) {
 
                 printk(KERN_DEBUG "Power Button IRQ %d not available\n",
                         gpio_to_irq(FSG_SB_GPIO));
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)
         pm_power_off = nas100d_power_off;
 
         if (request_irq(gpio_to_irq(NAS100D_RB_GPIO), &nas100d_reset_handler,
-                IRQF_DISABLED | IRQF_TRIGGER_LOW,
-                "NAS100D reset button", NULL) < 0) {
+                IRQF_TRIGGER_LOW, "NAS100D reset button", NULL) < 0) {
 
                 printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
                         gpio_to_irq(NAS100D_RB_GPIO));
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index ba5f1cda2a9d..88c025f52d8d 100644
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -265,16 +265,14 @@ static void __init nslu2_init(void)
         pm_power_off = nslu2_power_off;
 
         if (request_irq(gpio_to_irq(NSLU2_RB_GPIO), &nslu2_reset_handler,
-                IRQF_DISABLED | IRQF_TRIGGER_LOW,
-                "NSLU2 reset button", NULL) < 0) {
+                IRQF_TRIGGER_LOW, "NSLU2 reset button", NULL) < 0) {
 
                 printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
                         gpio_to_irq(NSLU2_RB_GPIO));
         }
 
         if (request_irq(gpio_to_irq(NSLU2_PB_GPIO), &nslu2_power_handler,
-                IRQF_DISABLED | IRQF_TRIGGER_HIGH,
-                "NSLU2 power button", NULL) < 0) {
+                IRQF_TRIGGER_HIGH, "NSLU2 power button", NULL) < 0) {
 
                 printk(KERN_DEBUG "Power Button IRQ %d not available\n",
                         gpio_to_irq(NSLU2_PB_GPIO));