diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-12 11:12:12 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-12 11:12:12 -0400 |
| commit | 158304ef09a28c7f2dd37d78f536a4e09ba084a1 (patch) | |
| tree | 2e6d808fef46d70268e547ccfc5926a865e3d2ea /arch/arm/mach-omap1/board-h2.c | |
| parent | 641e79129a56a4c50be1aed0fa713f440b46a440 (diff) | |
| parent | 25f4a81ef51b7c279786f5b81fe6d89510f46d99 (diff) | |
Merge branch 'fixes' into devel
Diffstat (limited to 'arch/arm/mach-omap1/board-h2.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index ad519390dd58..48c8c9195dc3 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
| @@ -326,7 +326,7 @@ static struct omap_lcd_config h2_lcd_config __initdata = { | |||
| 326 | .ctrl_name = "internal", | 326 | .ctrl_name = "internal", |
| 327 | }; | 327 | }; |
| 328 | 328 | ||
| 329 | static struct omap_board_config_kernel h2_config[] = { | 329 | static struct omap_board_config_kernel h2_config[] __initdata = { |
| 330 | { OMAP_TAG_USB, &h2_usb_config }, | 330 | { OMAP_TAG_USB, &h2_usb_config }, |
| 331 | { OMAP_TAG_MMC, &h2_mmc_config }, | 331 | { OMAP_TAG_MMC, &h2_mmc_config }, |
| 332 | { OMAP_TAG_UART, &h2_uart_config }, | 332 | { OMAP_TAG_UART, &h2_uart_config }, |