diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/sh/boards/mach-migor/setup.c | |
| parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
| parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/sh/boards/mach-migor/setup.c')
| -rw-r--r-- | arch/sh/boards/mach-migor/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index 184fde16913..2d4c9c8c666 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c | |||
| @@ -214,7 +214,7 @@ static struct platform_device migor_nand_flash_device = { | |||
| 214 | } | 214 | } |
| 215 | }; | 215 | }; |
| 216 | 216 | ||
| 217 | const static struct fb_videomode migor_lcd_modes[] = { | 217 | static const struct fb_videomode migor_lcd_modes[] = { |
| 218 | { | 218 | { |
| 219 | #if defined(CONFIG_SH_MIGOR_RTA_WVGA) | 219 | #if defined(CONFIG_SH_MIGOR_RTA_WVGA) |
| 220 | .name = "LB070WV1", | 220 | .name = "LB070WV1", |