Merge branch 'fix/asoc' into for-linus

[karo-tx-linux.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 797995ce18b9203155febaa89696392d9b981f61..d8bc86d76f1d2248b0d936f5cd1413c0ce0ba469 100644 (file)
--- a/arch/arm/mach-ixp4xx/avila-setup.c
+++ b/arch/arm/mach-ixp4xx/avila-setup.c
@@ -17,9 +17,7 @@
 #include <linux/serial.h>
 #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>
@@ -29,6 +27,9 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 
+#define AVILA_SDA_PIN  7
+#define AVILA_SCL_PIN  6
+
 static struct flash_platform_data avila_flash_data = {
        .map_name       = "cfi_probe",
        .width          = 2,