ARM: OMAP1: Misc clean-up

This patch cleans up omap1 files to sync up with linux-omap tree:

- Remove omap-generic MMC config as it should be defined in board-*.c files
  instead of using board-generic.c
- New style I2C board_info from David Brownell <dbrownell@users.sourceforge.net>
- Init section fixes from Dirk Behme <dirk.behme@googlemail.com>

Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 2 insertions, 21 deletions

diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c
index 005bf0e3e1e3..c711bf23f7b4 100644
--- a/arch/arm/mach-omap1/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
@@ -55,33 +55,14 @@ static struct omap_usb_config generic1610_usb_config __initdata = {
         .hmc_mode       = 16,
         .pins[0]        = 6,
 };
-
-static struct omap_mmc_config generic_mmc_config __initdata = {
-        .mmc [0] = {
-                .enabled        = 0,
-                .wire4          = 0,
-                .wp_pin         = -1,
-                .power_pin      = -1,
-                .switch_pin     = -1,
-        },
-        .mmc [1] = {
-                .enabled        = 0,
-                .wire4          = 0,
-                .wp_pin         = -1,
-                .power_pin      = -1,
-                .switch_pin     = -1,
-        },
-};
-
 #endif
 
 static struct omap_uart_config generic_uart_config __initdata = {
         .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
 };
 
-static struct omap_board_config_kernel generic_config[] = {
-        { OMAP_TAG_USB,           NULL },
-        { OMAP_TAG_MMC,           &generic_mmc_config },
+static struct omap_board_config_kernel generic_config[] __initdata = {
+        { OMAP_TAG_USB,         NULL },
         { OMAP_TAG_UART,        &generic_uart_config },
 };