aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-pxa/include/mach/pxafb.h13
-rw-r--r--drivers/video/pxafb.c10
2 files changed, 13 insertions, 10 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h
index 01a45ac48114..486b4c519ae2 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 {
158void pxa_set_fb_info(struct device *, struct pxafb_mach_info *); 158void pxa_set_fb_info(struct device *, struct pxafb_mach_info *);
159unsigned long pxafb_get_hsync_time(struct device *dev); 159unsigned long pxafb_get_hsync_time(struct device *dev);
160 160
161#ifdef CONFIG_FB_PXA_SMARTPANEL
161extern int pxafb_smart_queue(struct fb_info *info, uint16_t *cmds, int); 162extern int pxafb_smart_queue(struct fb_info *info, uint16_t *cmds, int);
162extern int pxafb_smart_flush(struct fb_info *info); 163extern int pxafb_smart_flush(struct fb_info *info);
164#else
165static inline int pxafb_smart_queue(struct fb_info *info,
166 uint16_t *cmds, int n)
167{
168 return 0;
169}
170
171static inline int pxafb_smart_flush(struct fb_info *info)
172{
173 return 0;
174}
175#endif
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 0f4e8c942f9e..389530bf1ada 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1309,16 +1309,6 @@ static int pxafb_smart_init(struct pxafb_info *fbi)
1309 return 0; 1309 return 0;
1310} 1310}
1311#else 1311#else
1312int pxafb_smart_queue(struct fb_info *info, uint16_t *cmds, int n_cmds)
1313{
1314 return 0;
1315}
1316
1317int pxafb_smart_flush(struct fb_info *info)
1318{
1319 return 0;
1320}
1321
1322static inline int pxafb_smart_init(struct pxafb_info *fbi) { return 0; } 1312static inline int pxafb_smart_init(struct pxafb_info *fbi) { return 0; }
1323#endif /* CONFIG_FB_PXA_SMARTPANEL */ 1313#endif /* CONFIG_FB_PXA_SMARTPANEL */
1324 1314