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
/
video
/
au1200fb.c
diff --git
a/drivers/video/au1200fb.c
b/drivers/video/au1200fb.c
index
600d3e0
..
c6a5f0c
100644
(file)
--- a/
drivers/video/au1200fb.c
+++ b/
drivers/video/au1200fb.c
@@
-1694,7
+1694,7
@@
static int au1200fb_drv_probe(struct device *dev)
/* Now hook interrupt too */
if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq,
/* Now hook interrupt too */
if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq,
-
SA_INTERRUPT | SA_SHIRQ
, "lcd", (void *)dev)) < 0) {
+
IRQF_DISABLED | IRQF_SHARED
, "lcd", (void *)dev)) < 0) {
print_err("fail to request interrupt line %d (err: %d)",
AU1200_LCD_INT, ret);
goto failed;
print_err("fail to request interrupt line %d (err: %d)",
AU1200_LCD_INT, ret);
goto failed;