[ARM] 5339/1: fix __fls() on ARM

[linux-2.6-omap-h63xx.git] / arch / arm / mach-ixp4xx / avila-setup.c

diff --git a/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c
index d59b8dc7dc7a837b109ed327dcab61317fd483f1..797995ce18b9203155febaa89696392d9b981f61 100644 (file)
--- a/arch/arm/mach-ixp4xx/avila-setup.c
+++ b/arch/arm/mach-ixp4xx/avila-setup.c
@@ -18,11 +18,12 @@
 #include <linux/tty.h>
 #include <linux/serial_8250.h>
 #include <linux/slab.h>
+#include <linux/i2c-gpio.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -47,18 +48,17 @@ static struct platform_device avila_flash = {
        .resource       = &avila_flash_resource,
 };
 
-static struct ixp4xx_i2c_pins avila_i2c_gpio_pins = {
+static struct i2c_gpio_platform_data avila_i2c_gpio_data = {
        .sda_pin        = AVILA_SDA_PIN,
        .scl_pin        = AVILA_SCL_PIN,
 };
 
-static struct platform_device avila_i2c_controller = {
-       .name           = "IXP4XX-I2C",
+static struct platform_device avila_i2c_gpio = {
+       .name           = "i2c-gpio",
        .id             = 0,
-       .dev            = {
-               .platform_data = &avila_i2c_gpio_pins,
+       .dev     = {
+               .platform_data  = &avila_i2c_gpio_data,
        },
-       .num_resources  = 0
 };
 
 static struct resource avila_uart_resources[] = {
@@ -133,7 +133,7 @@ static struct platform_device avila_pata = {
 };
 
 static struct platform_device *avila_devices[] __initdata = {
-       &avila_i2c_controller,
+       &avila_i2c_gpio,
        &avila_flash,
        &avila_uart
 };