Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / arch / arm / mach-pxa / pcm990-baseboard.c

diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index e6be9d0aeccf2d9e94c4a1ac11306529d5f1bf2f..49d951db0f3d9dca15d2f2aeaeacc11c3b666754 100644 (file)
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -320,16 +320,13 @@ static struct soc_camera_link iclink[] = {
 static struct i2c_board_info __initdata pcm990_i2c_devices[] = {
        {
                /* Must initialize before the camera(s) */
-               I2C_BOARD_INFO("pca953x", 0x41),
-               .type = "pca9536",
+               I2C_BOARD_INFO("pca9536", 0x41),
                .platform_data = &pca9536_data,
        }, {
                I2C_BOARD_INFO("mt9v022", 0x48),
-               .type = "mt9v022",
                .platform_data = &iclink[0], /* With extender */
        }, {
                I2C_BOARD_INFO("mt9m001", 0x5d),
-               .type = "mt9m001",
                .platform_data = &iclink[0], /* With extender */
        },
 };