projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus
[linux-2.6-microblaze.git]
/
drivers
/
input
/
keyboard
/
adp5588-keys.c
diff --git
a/drivers/input/keyboard/adp5588-keys.c
b/drivers/input/keyboard/adp5588-keys.c
index
e34eeb8
..
4a7f534
100644
(file)
--- a/
drivers/input/keyboard/adp5588-keys.c
+++ b/
drivers/input/keyboard/adp5588-keys.c
@@
-550,7
+550,7
@@
static int __devinit adp5588_probe(struct i2c_client *client,
}
error = request_irq(client->irq, adp5588_irq,
- IRQF_TRIGGER_FALLING
| IRQF_DISABLED
,
+ IRQF_TRIGGER_FALLING,
client->dev.driver->name, kpad);
if (error) {
dev_err(&client->dev, "irq %d busy?\n", client->irq);