diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 03:25:53 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 03:25:53 -0500 |
| commit | 9c3c8afccb6a163fd2be739f511e863eab668702 (patch) | |
| tree | e587a5377ada98fed8cfa6c8ee63125361f2818a /arch/arm/mach-shmobile/board-mackerel.c | |
| parent | 290293eda2c6dd368476d71433bdef07c39a6829 (diff) | |
| parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
Merge commit 'v2.6.38-rc8' into spi/next
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index fb4213a4e15a..1657eac5dde2 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c | |||
| @@ -303,7 +303,7 @@ static struct sh_mobile_lcdc_info lcdc_info = { | |||
| 303 | .lcd_cfg = mackerel_lcdc_modes, | 303 | .lcd_cfg = mackerel_lcdc_modes, |
| 304 | .num_cfg = ARRAY_SIZE(mackerel_lcdc_modes), | 304 | .num_cfg = ARRAY_SIZE(mackerel_lcdc_modes), |
| 305 | .interface_type = RGB24, | 305 | .interface_type = RGB24, |
| 306 | .clock_divider = 2, | 306 | .clock_divider = 3, |
| 307 | .flags = 0, | 307 | .flags = 0, |
| 308 | .lcd_size_cfg.width = 152, | 308 | .lcd_size_cfg.width = 152, |
| 309 | .lcd_size_cfg.height = 91, | 309 | .lcd_size_cfg.height = 91, |