1 Index: linux-2.6.22-rc3-git2-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c
2 ===================================================================
3 --- linux-2.6.22-rc3-git2-armeb.orig/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-31 04:05:30.000000000 -0700
4 +++ linux-2.6.22-rc3-git2-armeb/arch/arm/mach-ixp4xx/dsmg600-setup.c 2007-05-31 04:13:02.000000000 -0700
6 #include <linux/kernel.h>
7 #include <linux/serial.h>
8 #include <linux/serial_8250.h>
9 +#include <linux/i2c-gpio.h>
11 #include <asm/mach-types.h>
12 #include <asm/mach/arch.h>
14 .resource = &dsmg600_flash_resource,
17 -static struct ixp4xx_i2c_pins dsmg600_i2c_gpio_pins = {
18 +static struct i2c_gpio_platform_data dsmg600_i2c_gpio_data = {
19 .sda_pin = DSMG600_SDA_PIN,
20 .scl_pin = DSMG600_SCL_PIN,
23 -static struct platform_device dsmg600_i2c_controller = {
24 - .name = "IXP4XX-I2C",
25 +static struct platform_device dsmg600_i2c_gpio = {
28 - .dev.platform_data = &dsmg600_i2c_gpio_pins,
30 + .platform_data = &dsmg600_i2c_gpio_data,
34 #ifdef CONFIG_LEDS_CLASS
38 static struct platform_device *dsmg600_devices[] __initdata = {
39 - &dsmg600_i2c_controller,