diff options
Diffstat (limited to 'include/asm-arm/arch-pxa/pxafb.h')
-rw-r--r-- | include/asm-arm/arch-pxa/pxafb.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/asm-arm/arch-pxa/pxafb.h b/include/asm-arm/arch-pxa/pxafb.h index aba9b30f4249..81c3928d608c 100644 --- a/include/asm-arm/arch-pxa/pxafb.h +++ b/include/asm-arm/arch-pxa/pxafb.h | |||
@@ -12,12 +12,14 @@ | |||
12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/fb.h> | ||
16 | |||
15 | /* | 17 | /* |
16 | * This structure describes the machine which we are running on. | 18 | * This structure describes the machine which we are running on. |
17 | * It is set in linux/arch/arm/mach-pxa/machine_name.c and used in the probe routine | 19 | * It is set in linux/arch/arm/mach-pxa/machine_name.c and used in the probe routine |
18 | * of linux/drivers/video/pxafb.c | 20 | * of linux/drivers/video/pxafb.c |
19 | */ | 21 | */ |
20 | struct pxafb_mach_info { | 22 | struct pxafb_mode_info { |
21 | u_long pixclock; | 23 | u_long pixclock; |
22 | 24 | ||
23 | u_short xres; | 25 | u_short xres; |
@@ -34,6 +36,14 @@ struct pxafb_mach_info { | |||
34 | u_char sync; | 36 | u_char sync; |
35 | 37 | ||
36 | u_int cmap_greyscale:1, | 38 | u_int cmap_greyscale:1, |
39 | unused:31; | ||
40 | }; | ||
41 | |||
42 | struct pxafb_mach_info { | ||
43 | struct pxafb_mode_info *modes; | ||
44 | unsigned int num_modes; | ||
45 | |||
46 | u_int fixed_modes:1, | ||
37 | cmap_inverse:1, | 47 | cmap_inverse:1, |
38 | cmap_static:1, | 48 | cmap_static:1, |
39 | unused:29; | 49 | unused:29; |
@@ -62,7 +72,7 @@ struct pxafb_mach_info { | |||
62 | u_int lccr3; | 72 | u_int lccr3; |
63 | 73 | ||
64 | void (*pxafb_backlight_power)(int); | 74 | void (*pxafb_backlight_power)(int); |
65 | void (*pxafb_lcd_power)(int); | 75 | void (*pxafb_lcd_power)(int, struct fb_var_screeninfo *); |
66 | 76 | ||
67 | }; | 77 | }; |
68 | void set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info); | 78 | void set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info); |