git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
input
/
touchscreen
/
corgi_ts.c
diff --git
a/drivers/input/touchscreen/corgi_ts.c
b/drivers/input/touchscreen/corgi_ts.c
index
5013703
..
9b66271
100644
(file)
--- a/
drivers/input/touchscreen/corgi_ts.c
+++ b/
drivers/input/touchscreen/corgi_ts.c
@@
-17,7
+17,7
@@
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/slab.h>
-
//#include <asm
/irq.h>
+
#include <linux
/irq.h>
#include <asm/arch/sharpsl.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sharpsl.h>
#include <asm/arch/hardware.h>
@@
-318,7
+318,7
@@
static int __init corgits_probe(struct platform_device *pdev)
corgi_ssp_ads7846_putget((5u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
mdelay(5);
corgi_ssp_ads7846_putget((5u << ADSCTRL_ADR_SH) | ADSCTRL_STS);
mdelay(5);
- if (request_irq(corgi_ts->irq_gpio, ts_interrupt,
SA_INTERRUPT
, "ts", corgi_ts)) {
+ if (request_irq(corgi_ts->irq_gpio, ts_interrupt,
IRQF_DISABLED
, "ts", corgi_ts)) {
err = -EBUSY;
goto fail;
}
err = -EBUSY;
goto fail;
}