Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-ams-delta.c

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index c73ca61e585ef6f49385e8fc377a7a6974e12082..8b102ad59c147bc43999a26f59976ae9a9524caf 100644 (file)
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -135,21 +135,21 @@ static void __init ams_delta_init_irq(void)
 }
 
 static struct map_desc ams_delta_io_desc[] __initdata = {
-       // AMS_DELTA_LATCH1
+       /* AMS_DELTA_LATCH1 */
        {
                .virtual        = AMS_DELTA_LATCH1_VIRT,
                .pfn            = __phys_to_pfn(AMS_DELTA_LATCH1_PHYS),
                .length         = 0x01000000,
                .type           = MT_DEVICE
        },
-       // AMS_DELTA_LATCH2
+       /* AMS_DELTA_LATCH2 */
        {
                .virtual        = AMS_DELTA_LATCH2_VIRT,
                .pfn            = __phys_to_pfn(AMS_DELTA_LATCH2_PHYS),
                .length         = 0x01000000,
                .type           = MT_DEVICE
        },
-       // AMS_DELTA_MODEM
+       /* AMS_DELTA_MODEM */
        {
                .virtual        = AMS_DELTA_MODEM_VIRT,
                .pfn            = __phys_to_pfn(AMS_DELTA_MODEM_PHYS),
@@ -227,6 +227,7 @@ static void __init ams_delta_init(void)
        omap_board_config = ams_delta_config;
        omap_board_config_size = ARRAY_SIZE(ams_delta_config);
        omap_serial_init();
+       omap_register_i2c_bus(1, 100, NULL, 0);
 
        /* Clear latch2 (NAND, LCD, modem enable) */
        ams_delta_latch2_write(~0, 0);