From 16bec371d849164ab4330ffc13f2b873793060a7 Mon Sep 17 00:00:00 2001 From: Senthilvadivu Guruswamy Date: Fri, 8 Oct 2010 08:44:31 +0200 Subject: [PATCH] --- yaml --- r: 217317 b: refs/heads/master c: 27eb42e924d75e6a85257d431ce7b6e84d5255ef h: refs/heads/master i: 217315: 71e4fe1586636656df2ddb3f6d556e74f35cd5c9 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/include/plat/vrfb.h | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 15f0dae6a3ea..2ab683a8277d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1a75a1aa11a4f48668ef295368ae1b65bd960c7 +refs/heads/master: 27eb42e924d75e6a85257d431ce7b6e84d5255ef diff --git a/trunk/arch/arm/plat-omap/include/plat/vrfb.h b/trunk/arch/arm/plat-omap/include/plat/vrfb.h index d8a03ced3b10..3792bdea2f6d 100644 --- a/trunk/arch/arm/plat-omap/include/plat/vrfb.h +++ b/trunk/arch/arm/plat-omap/include/plat/vrfb.h @@ -35,6 +35,7 @@ struct vrfb { bool yuv_mode; }; +#ifdef CONFIG_OMAP2_VRFB extern int omap_vrfb_request_ctx(struct vrfb *vrfb); extern void omap_vrfb_release_ctx(struct vrfb *vrfb); extern void omap_vrfb_adjust_size(u16 *width, u16 *height, @@ -47,4 +48,19 @@ extern void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, extern int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot); extern void omap_vrfb_restore_context(void); +#else +static inline int omap_vrfb_request_ctx(struct vrfb *vrfb) { return 0; } +static inline void omap_vrfb_release_ctx(struct vrfb *vrfb) {} +static inline void omap_vrfb_adjust_size(u16 *width, u16 *height, + u8 bytespp) {} +static inline u32 omap_vrfb_min_phys_size(u16 width, u16 height, u8 bytespp) + { return 0; } +static inline u16 omap_vrfb_max_height(u32 phys_size, u16 width, u8 bytespp) + { return 0; } +static inline void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, + u16 width, u16 height, unsigned bytespp, bool yuv_mode) {} +static inline int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot) + { return 0; } +static inline void omap_vrfb_restore_context(void) {} +#endif #endif /* __VRFB_H */