1 diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c linux-2.6.23/arch/arm/mach-ixp4xx/ixdp425-setup.c
2 --- linux-2.6.23.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-10-09 15:31:38.000000000 -0500
3 +++ linux-2.6.23/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-10-11 01:01:02.000000000 -0500
6 #include <linux/serial_8250.h>
7 #include <linux/slab.h>
8 +#include <linux/i2c-gpio.h>
10 #include <linux/mtd/mtd.h>
11 #include <linux/mtd/nand.h>
12 @@ -120,18 +121,17 @@ static struct platform_device ixdp425_fl
14 #endif /* CONFIG_MTD_NAND_PLATFORM */
16 -static struct ixp4xx_i2c_pins ixdp425_i2c_gpio_pins = {
17 +static struct i2c_gpio_platform_data ixdp425_i2c_gpio_data = {
18 .sda_pin = IXDP425_SDA_PIN,
19 .scl_pin = IXDP425_SCL_PIN,
22 -static struct platform_device ixdp425_i2c_controller = {
23 - .name = "IXP4XX-I2C",
24 +static struct platform_device ixdp425_i2c_gpio = {
28 - .platform_data = &ixdp425_i2c_gpio_pins,
30 + .platform_data = &ixdp425_i2c_gpio_data,
35 static struct resource ixdp425_uart_resources[] = {
36 @@ -178,7 +178,7 @@ static struct platform_device ixdp425_ua
39 static struct platform_device *ixdp425_devices[] __initdata = {
40 - &ixdp425_i2c_controller,
43 #if defined(CONFIG_MTD_NAND_PLATFORM) || \
44 defined(CONFIG_MTD_NAND_PLATFORM_MODULE)