Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
  [ARM] constify function pointer tables
  [ARM] 4823/1: AT91 section fix
  [ARM] 4824/1: pxa: clear RDH bit after any reset
  [ARM] pxa: remove debugging PM: printk
  ARM: OMAP1: Misc clean-up
  ARM: OMAP1: Update defconfigs for omap1
  ARM: OMAP1: Palm Tungsten E board clean-up
  ARM: OMAP1: Use I2C bus registration helper for omap1
  ARM: OMAP1: Remove omap_sram_idle()
  ARM: OMAP1: PM fixes for OMAP1
  ARM: OMAP1: Use MMC multislot structures for Siemens SX1 board
  ARM: OMAP1: Make omap1 use MMC multislot structures
  ARM: OMAP1: Change the comments to C style
  ARM: OMAP1: Make omap1 boards to use omap_nand_platform_data
  ARM: OMAP: Add helper module for board specific I2C bus registration
  ARM: OMAP: Add dmtimer support for OMAP3
  ARM: OMAP: Pre-3430 clean-up for dmtimer.c
  ARM: OMAP: Add DMA support for chaining and 3430
  ARM: OMAP: Add 24xx GPIO debounce support
  ARM: OMAP: Get rid of unnecessary ifdefs in GPIO code
  ...

1 files changed, 10 insertions, 9 deletions

diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index 7d2d8af155a3..4b8ae3ee0d05 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -134,12 +134,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
 static struct omap_alsa_codec_config alsa_config = {
         .name                   = "OMAP Innovator AIC23",
         .mcbsp_regs_alsa        = &mcbsp_regs,
-        .codec_configure_dev    = NULL, // aic23_configure,
-        .codec_set_samplerate   = NULL, // aic23_set_samplerate,
-        .codec_clock_setup      = NULL, // aic23_clock_setup,
-        .codec_clock_on         = NULL, // aic23_clock_on,
-        .codec_clock_off        = NULL, // aic23_clock_off,
-        .get_default_samplerate = NULL, // aic23_get_default_samplerate,
+        .codec_configure_dev    = NULL, /* aic23_configure, */
+        .codec_set_samplerate   = NULL, /* aic23_set_samplerate, */
+        .codec_clock_setup      = NULL, /* aic23_clock_setup, */
+        .codec_clock_on         = NULL, /* aic23_clock_on, */
+        .codec_clock_off        = NULL, /* aic23_clock_off, */
+        .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */
 };
 
 static struct platform_device innovator_mcbsp1_device = {
@@ -345,11 +345,11 @@ static struct omap_usb_config h2_usb_config __initdata = {
         .otg            = 2,
 
 #ifdef  CONFIG_USB_GADGET_OMAP
-        .hmc_mode       = 19,   // 0:host(off) 1:dev|otg 2:disabled
-        // .hmc_mode    = 21,   // 0:host(off) 1:dev(loopback) 2:host(loopback)
+        .hmc_mode       = 19,   /* 0:host(off) 1:dev|otg 2:disabled */
+        /* .hmc_mode    = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */
 #elif   defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         /* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */
-        .hmc_mode       = 20,   // 1:dev|otg(off) 1:host 2:disabled
+        .hmc_mode       = 20,   /* 1:dev|otg(off) 1:host 2:disabled */
 #endif
 
         .pins[1]        = 3,
@@ -411,6 +411,7 @@ static void __init innovator_init(void)
         omap_board_config = innovator_config;
         omap_board_config_size = ARRAY_SIZE(innovator_config);
         omap_serial_init();
+        omap_register_i2c_bus(1, 100, NULL, 0);
 }
 
 static void __init innovator_map_io(void)