diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-23 13:06:37 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-23 13:06:37 -0500 |
| commit | 40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb (patch) | |
| tree | 0d949c487ba15c4c8198a69cd7b8c0cdb5773af4 /arch/arm/mach-pxa/e400.c | |
| parent | d83a12a40915774332cec625856c2e7ba9033e15 (diff) | |
| parent | 3b24f30c4f678cfab5c6d090af9559fefa37cc41 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/am200epd.c
arch/arm/mach-pxa/ezx.c
Diffstat (limited to 'arch/arm/mach-pxa/e400.c')
| -rw-r--r-- | arch/arm/mach-pxa/e400.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/e400.c b/arch/arm/mach-pxa/e400.c index 7716ad0c3b34..bed0336aca3d 100644 --- a/arch/arm/mach-pxa/e400.c +++ b/arch/arm/mach-pxa/e400.c | |||
| @@ -52,7 +52,7 @@ static struct pxafb_mode_info e400_pxafb_mode_info = { | |||
| 52 | static struct pxafb_mach_info e400_pxafb_mach_info = { | 52 | static struct pxafb_mach_info e400_pxafb_mach_info = { |
| 53 | .modes = &e400_pxafb_mode_info, | 53 | .modes = &e400_pxafb_mode_info, |
| 54 | .num_modes = 1, | 54 | .num_modes = 1, |
| 55 | .lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Act, | 55 | .lcd_conn = LCD_COLOR_TFT_16BPP, |
| 56 | .lccr3 = 0, | 56 | .lccr3 = 0, |
| 57 | .pxafb_backlight_power = NULL, | 57 | .pxafb_backlight_power = NULL, |
| 58 | }; | 58 | }; |