Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / arch / unicore32 / kernel / puv3-nb0916.c

diff --git a/arch/unicore32/kernel/puv3-nb0916.c b/arch/unicore32/kernel/puv3-nb0916.c
index e731c561ed4ec3b05132c27f28473b09bf42b926..181108b8ecce766d0102b9e12ac070e6510337b0 100644 (file)
--- a/arch/unicore32/kernel/puv3-nb0916.c
+++ b/arch/unicore32/kernel/puv3-nb0916.c
@@ -13,7 +13,6 @@
 
 #include <linux/init.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
 #include <linux/io.h>
@@ -124,7 +123,7 @@ int __init mach_nb0916_init(void)
 
        if (request_irq(gpio_to_irq(GPI_LCD_CASE_OFF),
                &nb0916_lcdcaseoff_handler,
-               IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+               IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                "NB0916 lcd case off", NULL) < 0) {
 
                printk(KERN_DEBUG "LCD-Case-OFF IRQ %d not available\n",
@@ -132,7 +131,7 @@ int __init mach_nb0916_init(void)
        }
 
        if (request_irq(gpio_to_irq(GPI_OTP_INT), &nb0916_overheat_handler,
-               IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+               IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                "NB0916 overheating protection", NULL) < 0) {
 
                printk(KERN_DEBUG "Overheating Protection IRQ %d not available\n",