diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-23 18:25:50 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-23 18:25:50 +0200 |
| commit | 4ce5f33cd4bcde2e25d50ae0880eb39213e2b6d2 (patch) | |
| tree | 521d081151c260f2ecccfa334a184547caf7fbb2 /include | |
| parent | b8fd949e585e9b991b36f9edc40ebec1a7dd885b (diff) | |
| parent | c42fae0d24de8e7590a0b36e66eb6bc3b3e773c7 (diff) | |
Merge branch 'glamo-2.6.34' into om-gta02-2.6.34
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/glamofb.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h index 5f9fab5a487..896579be1a0 100644 --- a/include/linux/glamofb.h +++ b/include/linux/glamofb.h @@ -1,31 +1,17 @@ #ifndef _LINUX_GLAMOFB_H #define _LINUX_GLAMOFB_H -#include <linux/fb.h> - #ifdef __KERNEL__ -struct glamo_core; -struct glamofb_handle; +#include <linux/fb.h> struct glamo_fb_platform_data { int width, height; int num_modes; struct fb_videomode *modes; - - struct glamo_core *core; }; -int glamofb_cmd_mode(struct glamofb_handle *gfb, int on); -int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val); - -#ifdef CONFIG_MFD_GLAMO -void glamo_lcm_reset(struct platform_device *pdev, int level); -#else -#define glamo_lcm_reset(...) do {} while (0) -#endif - #endif #define GLAMOFB_ENGINE_ENABLE _IOW('F', 0x1, __u32) |