git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
input
/
keyboard
/
pxa930_rotary.c
diff --git
a/drivers/input/keyboard/pxa930_rotary.c
b/drivers/input/keyboard/pxa930_rotary.c
index
b7123a4
..
35451bf
100644
(file)
--- a/
drivers/input/keyboard/pxa930_rotary.c
+++ b/
drivers/input/keyboard/pxa930_rotary.c
@@
-148,7
+148,7
@@
static int __devinit pxa930_rotary_probe(struct platform_device *pdev)
r->input_dev = input_dev;
input_set_drvdata(input_dev, r);
- err = request_irq(irq, rotary_irq,
IRQF_DISABLED
,
+ err = request_irq(irq, rotary_irq,
0
,
"enhanced rotary", r);
if (err) {
dev_err(&pdev->dev, "failed to request IRQ\n");