1 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index d5008d8fc9a5..e89070da28bf 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -15,6 +15,7 @@
 #include <linux/tty.h>
 #include <linux/serial_8250.h>
 #include <linux/slab.h>
+#include <linux/i2c-gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
@@ -120,18 +121,17 @@ static struct platform_device ixdp425_flash_nand = {
 };
 #endif  /* CONFIG_MTD_NAND_PLATFORM */
 
-static struct ixp4xx_i2c_pins ixdp425_i2c_gpio_pins = {
+static struct i2c_gpio_platform_data ixdp425_i2c_gpio_data = {
         .sda_pin        = IXDP425_SDA_PIN,
         .scl_pin        = IXDP425_SCL_PIN,
 };
 
-static struct platform_device ixdp425_i2c_controller = {
-        .name           = "IXP4XX-I2C",
+static struct platform_device ixdp425_i2c_gpio = {
+        .name           = "i2c-gpio",
         .id             = 0,
-        .dev            = {
-                .platform_data = &ixdp425_i2c_gpio_pins,
+        .dev     = {
+                .platform_data  = &ixdp425_i2c_gpio_data,
         },
-        .num_resources  = 0
 };
 
 static struct resource ixdp425_uart_resources[] = {
@@ -178,7 +178,7 @@ static struct platform_device ixdp425_uart = {
 };
 
 static struct platform_device *ixdp425_devices[] __initdata = {
-        &ixdp425_i2c_controller,
+        &ixdp425_i2c_gpio,
         &ixdp425_flash,
 #if defined(CONFIG_MTD_NAND_PLATFORM) || \
     defined(CONFIG_MTD_NAND_PLATFORM_MODULE)