summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include/mach/pxafb.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-30 21:26:37 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-30 21:26:37 +0100
commit91fed558d0f33c74477569f50ed883fe6d430f1f (patch)
tree84b32eb5f9b995efc21e39ee241fed38372d5f3b /arch/arm/mach-pxa/include/mach/pxafb.h
parentdb1c5628eb8a321af7585e58019de99ccd2f28b2 (diff)
parent1a64200ec5e93be03e27c3b2fc332e04ae443eb2 (diff)
Merge branch 'pxa/fixes' into next/fixes
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/pxafb.h')
-rw-r--r--arch/arm/mach-pxa/include/mach/pxafb.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h
index 01a45ac4811..486b4c519ae 100644
--- a/arch/arm/mach-pxa/include/mach/pxafb.h
+++ b/arch/arm/mach-pxa/include/mach/pxafb.h
@@ -158,5 +158,18 @@ struct pxafb_mach_info {
void pxa_set_fb_info(struct device *, struct pxafb_mach_info *);
unsigned long pxafb_get_hsync_time(struct device *dev);
+#ifdef CONFIG_FB_PXA_SMARTPANEL
extern int pxafb_smart_queue(struct fb_info *info, uint16_t *cmds, int);
extern int pxafb_smart_flush(struct fb_info *info);
+#else
+static inline int pxafb_smart_queue(struct fb_info *info,
+ uint16_t *cmds, int n)
+{
+ return 0;
+}
+
+static inline int pxafb_smart_flush(struct fb_info *info)
+{
+ return 0;
+}
+#endif