From c0a1549a6e5d683e20291a665540269121e17501 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 12 May 2008 14:58:02 -0700 Subject: [PATCH] I2C: Remove .type field As done for mainline board-*.c files in patch 3760f736716f74bdc62a4ba5406934338da93eb2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-h3.c | 1 - arch/arm/mach-omap2/board-h4.c | 4 +--- arch/arm/mach-omap2/board-n800.c | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 733a7eea033..b2a12864007 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c @@ -612,7 +612,6 @@ static struct i2c_board_info __initdata h3_i2c_board_info[] = { #endif { I2C_BOARD_INFO("isp1301_omap", 0x2d), - .type = "isp1301_omap", .irq = OMAP_GPIO_IRQ(14), }, }; diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 04c2cd8d80f..101b455f3f0 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -644,8 +644,7 @@ static struct ov9640_platform_data h4_ov9640_platform_data = { 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 */ }, { @@ -654,7 +653,6 @@ static struct i2c_board_info __initdata h4_i2c_board_info[] = { }, { I2C_BOARD_INFO("isp1301_omap", 0x2d), - .type = "isp1301_omap", .irq = OMAP_GPIO_IRQ(125), }, #if defined(CONFIG_VIDEO_OV9640) || defined(CONFIG_VIDEO_OV9640_MODULE) diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c index b62f2d5b4d1..efcb25da201 100644 --- a/arch/arm/mach-omap2/board-n800.c +++ b/arch/arm/mach-omap2/board-n800.c @@ -657,18 +657,15 @@ static struct i2c_board_info __initdata n800_i2c_board_info_2[] = { #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", }, }; -- 2.41.1