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-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
input
/
touchscreen
/
atmel_tsadcc.c
diff --git
a/drivers/input/touchscreen/atmel_tsadcc.c
b/drivers/input/touchscreen/atmel_tsadcc.c
index
432c69b
..
122a878
100644
(file)
--- a/
drivers/input/touchscreen/atmel_tsadcc.c
+++ b/
drivers/input/touchscreen/atmel_tsadcc.c
@@
-229,7
+229,7
@@
static int __devinit atmel_tsadcc_probe(struct platform_device *pdev)
goto err_release_mem;
}
- err = request_irq(ts_dev->irq, atmel_tsadcc_interrupt,
IRQF_DISABLED
,
+ err = request_irq(ts_dev->irq, atmel_tsadcc_interrupt,
0
,
pdev->dev.driver->name, ts_dev);
if (err) {
dev_err(&pdev->dev, "failed to allocate irq.\n");