r3577 - branches/src/target/kernel/2.6.24.x/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Wed Dec 5 17:58:32 CET 2007
Author: laforge
Date: 2007-12-05 17:58:28 +0100 (Wed, 05 Dec 2007)
New Revision: 3577
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch
Log:
gta01-inputdevice: SA_INTERRUPT -> IRQF_ changes
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch 2007-12-05 16:56:31 UTC (rev 3576)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch 2007-12-05 16:58:28 UTC (rev 3577)
@@ -37,7 +37,7 @@
===================================================================
--- /dev/null
+++ linux-2.6/drivers/input/keyboard/gta01kbd.c
-@@ -0,0 +1,250 @@
+@@ -0,0 +1,249 @@
+/*
+ * Keyboard driver for FIC GTA01 (Neo1973) GSM phone
+ *
@@ -201,25 +201,24 @@
+
+ input_register_device(gta01kbd->input);
+
-+ if (request_irq(irq_aux, gta01kbd_aux_irq,
-+ IRQF_DISABLED | IRQF_TRIGGER_RISING |
-+ IRQF_TRIGGER_FALLING, "Neo1973 AUX button",
-+ gta01kbd)) {
++ if (request_irq(irq_aux, gta01kbd_aux_irq, IRQF_DISABLED |
++ IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
++ "Neo1973 AUX button", gta01kbd)) {
+ dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_aux);
+ goto out_aux;
+ }
+ enable_irq_wake(irq_aux);
+
-+ if (request_irq(irq_hold, gta01kbd_hold_irq,
-+ SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
++ if (request_irq(irq_hold, gta01kbd_hold_irq, IRQF_DISABLED |
++ IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+ "Neo1973 HOLD button", gta01kbd)) {
+ dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_hold);
+ goto out_hold;
+ }
+ enable_irq_wake(irq_hold);
+
-+ if (request_irq(irq_jack, gta01kbd_headphone_irq,
-+ SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING,
++ if (request_irq(irq_jack, gta01kbd_headphone_irq, IRQF_DISABLED |
++ IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+ "Neo1973 Headphone Jack", gta01kbd)) {
+ dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_jack);
+ goto out_jack;
More information about the commitlog
mailing list