summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard/corgikbd.c
diff options
context:
space:
mode:
authorThomas Gleixner2006-07-02 04:29:38 +0200
committerLinus Torvalds2006-07-02 22:58:50 +0200
commitdace145374b8e39aeb920304c358ab5e220341ab (patch)
treee37c76578468f489ce2dbec4d04400380c14ee14 /drivers/input/keyboard/corgikbd.c
parent[PATCH] irq-flags: media: Use the new IRQF_ constants (diff)
downloadkernel-qcow2-linux-dace145374b8e39aeb920304c358ab5e220341ab.tar.gz
kernel-qcow2-linux-dace145374b8e39aeb920304c358ab5e220341ab.tar.xz
kernel-qcow2-linux-dace145374b8e39aeb920304c358ab5e220341ab.zip
[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/input/keyboard/corgikbd.c')
-rw-r--r--drivers/input/keyboard/corgikbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index 1f0e720267d7..1e03153b9bca 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -352,7 +352,7 @@ static int __init corgikbd_probe(struct platform_device *pdev)
for (i = 0; i < CORGI_KEY_SENSE_NUM; i++) {
pxa_gpio_mode(CORGI_GPIO_KEY_SENSE(i) | GPIO_IN);
if (request_irq(CORGI_IRQ_GPIO_KEY_SENSE(i), corgikbd_interrupt,
- SA_INTERRUPT | SA_TRIGGER_RISING,
+ IRQF_DISABLED | IRQF_TRIGGER_RISING,
"corgikbd", corgikbd))
printk(KERN_WARNING "corgikbd: Can't get IRQ: %d!\n", i);
}