From 5583076618934060b82650d2aa9bc62ef4114e12 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 26 Jul 2011 10:59:09 +0100
Subject: [PATCH] --- yaml --- r: 269392 b: refs/heads/master c:
 cb049419050f572d09c592fd103eaa90a8b6d9fe h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/i2c/busses/i2c-ixp2000.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6135623a2b42..38eb4d202a77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db3f72853ee2d89beb1e0bbec274fca0bf44db54
+refs/heads/master: cb049419050f572d09c592fd103eaa90a8b6d9fe
diff --git a/trunk/drivers/i2c/busses/i2c-ixp2000.c b/trunk/drivers/i2c/busses/i2c-ixp2000.c
index 5d8aed5ec21b..be9991bc2a74 100644
--- a/trunk/drivers/i2c/busses/i2c-ixp2000.c
+++ b/trunk/drivers/i2c/busses/i2c-ixp2000.c
@@ -35,7 +35,7 @@
 #include <linux/slab.h>
 
 #include <mach/hardware.h>	/* Pick up IXP2000-specific bits */
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 
 static inline int ixp2000_scl_pin(void *data)
 {