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 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
drivers
/
video
/
pxafb.c
diff --git
a/drivers/video/pxafb.c
b/drivers/video/pxafb.c
index
0f4e8c9
..
1d1e4f1
100644
(file)
--- a/
drivers/video/pxafb.c
+++ b/
drivers/video/pxafb.c
@@
-1309,16
+1309,6
@@
static int pxafb_smart_init(struct pxafb_info *fbi)
return 0;
}
#else
return 0;
}
#else
-int pxafb_smart_queue(struct fb_info *info, uint16_t *cmds, int n_cmds)
-{
- return 0;
-}
-
-int pxafb_smart_flush(struct fb_info *info)
-{
- return 0;
-}
-
static inline int pxafb_smart_init(struct pxafb_info *fbi) { return 0; }
#endif /* CONFIG_FB_PXA_SMARTPANEL */
static inline int pxafb_smart_init(struct pxafb_info *fbi) { return 0; }
#endif /* CONFIG_FB_PXA_SMARTPANEL */
@@
-2191,7
+2181,7
@@
static int __devinit pxafb_probe(struct platform_device *dev)
goto failed_free_mem;
}
goto failed_free_mem;
}
- ret = request_irq(irq, pxafb_handle_irq,
IRQF_DISABLED
, "LCD", fbi);
+ ret = request_irq(irq, pxafb_handle_irq,
0
, "LCD", fbi);
if (ret) {
dev_err(&dev->dev, "request_irq failed: %d\n", ret);
ret = -EBUSY;
if (ret) {
dev_err(&dev->dev, "request_irq failed: %d\n", ret);
ret = -EBUSY;