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/pcm990-baseboard.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/pcm990-baseboard.c')
| -rw-r--r-- | arch/arm/mach-pxa/pcm990-baseboard.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index 3ea01e0eac63..34841c72815f 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c | |||
| @@ -104,8 +104,7 @@ static struct pxafb_mode_info fb_info_sharp_lq084v1dg21 = { | |||
| 104 | static struct pxafb_mach_info pcm990_fbinfo __initdata = { | 104 | static struct pxafb_mach_info pcm990_fbinfo __initdata = { |
| 105 | .modes = &fb_info_sharp_lq084v1dg21, | 105 | .modes = &fb_info_sharp_lq084v1dg21, |
| 106 | .num_modes = 1, | 106 | .num_modes = 1, |
| 107 | .lccr0 = LCCR0_PAS, | 107 | .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL, |
| 108 | .lccr3 = LCCR3_PCP, | ||
| 109 | .pxafb_lcd_power = pcm990_lcd_power, | 108 | .pxafb_lcd_power = pcm990_lcd_power, |
| 110 | }; | 109 | }; |
| 111 | #elif defined(CONFIG_PCM990_DISPLAY_NEC) | 110 | #elif defined(CONFIG_PCM990_DISPLAY_NEC) |
| @@ -127,8 +126,7 @@ struct pxafb_mode_info fb_info_nec_nl6448bc20_18d = { | |||
| 127 | static struct pxafb_mach_info pcm990_fbinfo __initdata = { | 126 | static struct pxafb_mach_info pcm990_fbinfo __initdata = { |
| 128 | .modes = &fb_info_nec_nl6448bc20_18d, | 127 | .modes = &fb_info_nec_nl6448bc20_18d, |
| 129 | .num_modes = 1, | 128 | .num_modes = 1, |
| 130 | .lccr0 = LCCR0_Act, | 129 | .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL, |
| 131 | .lccr3 = LCCR3_PixFlEdg, | ||
| 132 | .pxafb_lcd_power = pcm990_lcd_power, | 130 | .pxafb_lcd_power = pcm990_lcd_power, |
| 133 | }; | 131 | }; |
| 134 | #endif | 132 | #endif |