#endif
        {
                I2C_BOARD_INFO("isp1301_omap", 0x2d),
-               .type           = "isp1301_omap",
                .irq            = OMAP_GPIO_IRQ(14),
        },
 };
 
 
 static struct i2c_board_info __initdata h4_i2c_board_info[] = {
        {
-               I2C_BOARD_INFO("rtc-rs5c372", 0x32),
-               .type = "rv5c387a",
+               I2C_BOARD_INFO("rv5c387a", 0x32),
                /* no IRQ wired to OMAP; nINTB goes to AGPS */
        },
        {
        },
        {
                I2C_BOARD_INFO("isp1301_omap", 0x2d),
-               .type           = "isp1301_omap",
                .irq            = OMAP_GPIO_IRQ(125),
        },
 #if defined(CONFIG_VIDEO_OV9640) || defined(CONFIG_VIDEO_OV9640_MODULE)
 
 #ifdef CONFIG_MACH_NOKIA_N810
        {
                I2C_BOARD_INFO("lm8323", 0x45),
-               .type           = "lm8323",
                .irq            = OMAP_GPIO_IRQ(109),
                .platform_data  = &lm8323_pdata,
        },
 #endif
        {
                I2C_BOARD_INFO("tsl2563", 0x29),
-               .type           = "tsl2563",
        },
        {
                I2C_BOARD_INFO("lp5521", 0x32),
-               .type           = "lp5521",
        },
 };