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
/
i2c
/
busses
/
i2c-pxa.c
diff --git
a/drivers/i2c/busses/i2c-pxa.c
b/drivers/i2c/busses/i2c-pxa.c
index
5155010
..
ee114b4
100644
(file)
--- a/
drivers/i2c/busses/i2c-pxa.c
+++ b/
drivers/i2c/busses/i2c-pxa.c
@@
-968,7
+968,7
@@
static int i2c_pxa_probe(struct platform_device *dev)
#endif
pxa_set_cken(CKEN14_I2C, 1);
- ret = request_irq(IRQ_I2C, i2c_pxa_handler,
SA_INTERRUPT
,
+ ret = request_irq(IRQ_I2C, i2c_pxa_handler,
IRQF_DISABLED
,
"pxa2xx-i2c", i2c);
if (ret)
goto out;