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 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
input
/
touchscreen
/
hp680_ts_input.c
diff --git
a/drivers/input/touchscreen/hp680_ts_input.c
b/drivers/input/touchscreen/hp680_ts_input.c
index
dd4e8f0
..
639a604
100644
(file)
--- a/
drivers/input/touchscreen/hp680_ts_input.c
+++ b/
drivers/input/touchscreen/hp680_ts_input.c
@@
-93,7
+93,7
@@
static int __init hp680_ts_init(void)
hp680_ts_dev->phys = "hp680_ts/input0";
if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt,
-
IRQF_DISABLED
, MODNAME, 0) < 0) {
+
0
, MODNAME, 0) < 0) {
printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n",
HP680_TS_IRQ);
err = -EBUSY;