diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 09:14:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 09:14:00 -0700 |
| commit | 63c422afe3739b68bec0b5c42807d1450c951caf (patch) | |
| tree | 2cdbcbd4c6fcea69fbe0b164242336c38168f631 /include | |
| parent | 6f3a28f7d1f0a65a78443c273b6e8ec01becf301 (diff) | |
| parent | d14b272bc63f35a8f20b4b1df16c080b8d24f8f1 (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3848/1: pxafb: Add option of fixing video modes and spitz QVGA mode support
[ARM] 3880/1: remove the last trace of iop31x support
[ARM] 3879/1: ep93xx: instantiate platform devices for ep93xx ethernet
[ARM] 3809/3: get rid of 4 megabyte kernel image size limit
[ARM] Fix XIP_KERNEL build error in arch/arm/mm/mmu.c
[ARM] 3874/1: Remove leftover usage of asm/timeofday.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-pxa/pxafb.h | 14 | ||||
| -rw-r--r-- | include/asm-arm/arch-pxa/spitz.h | 4 | ||||
| -rw-r--r-- | include/asm-arm/timeofday.h | 4 |
3 files changed, 15 insertions, 7 deletions
diff --git a/include/asm-arm/arch-pxa/pxafb.h b/include/asm-arm/arch-pxa/pxafb.h index aba9b30f424..81c3928d608 100644 --- a/include/asm-arm/arch-pxa/pxafb.h +++ b/include/asm-arm/arch-pxa/pxafb.h @@ -12,12 +12,14 @@ * published by the Free Software Foundation. */ +#include <linux/fb.h> + /* * This structure describes the machine which we are running on. * It is set in linux/arch/arm/mach-pxa/machine_name.c and used in the probe routine * of linux/drivers/video/pxafb.c */ -struct pxafb_mach_info { +struct pxafb_mode_info { u_long pixclock; u_short xres; @@ -34,6 +36,14 @@ struct pxafb_mach_info { u_char sync; u_int cmap_greyscale:1, + unused:31; +}; + +struct pxafb_mach_info { + struct pxafb_mode_info *modes; + unsigned int num_modes; + + u_int fixed_modes:1, cmap_inverse:1, cmap_static:1, unused:29; @@ -62,7 +72,7 @@ struct pxafb_mach_info { u_int lccr3; void (*pxafb_backlight_power)(int); - void (*pxafb_lcd_power)(int); + void (*pxafb_lcd_power)(int, struct fb_var_screeninfo *); }; void set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info); diff --git a/include/asm-arm/arch-pxa/spitz.h b/include/asm-arm/arch-pxa/spitz.h index 62e1fe4d025..4953dd324d4 100644 --- a/include/asm-arm/arch-pxa/spitz.h +++ b/include/asm-arm/arch-pxa/spitz.h @@ -15,6 +15,8 @@ #define __ASM_ARCH_SPITZ_H 1 #endif +#include <linux/fb.h> + /* Spitz/Akita GPIOs */ #define SPITZ_GPIO_KEY_INT (0) /* Key Interrupt */ @@ -155,4 +157,4 @@ extern struct platform_device spitzscoop2_device; extern struct platform_device spitzssp_device; extern struct sharpsl_charger_machinfo spitz_pm_machinfo; -extern void spitz_lcd_power(int on); +extern void spitz_lcd_power(int on, struct fb_var_screeninfo *var); diff --git a/include/asm-arm/timeofday.h b/include/asm-arm/timeofday.h deleted file mode 100644 index 27254bd5b94..00000000000 --- a/include/asm-arm/timeofday.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _ASM_ARM_TIMEOFDAY_H -#define _ASM_ARM_TIMEOFDAY_H -#include <asm-generic/timeofday.h> -#endif |