From: David Brownell <dbrownell@users.sourceforge.net>
Date: Mon, 24 Nov 2008 18:32:49 +0000 (-0800)
Subject: sync isp1301_omap with mainlne
X-Git-Tag: v2.6.28-omap1~105
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5019ed843f3208482c64043e4052e89b3d5462a0;p=linux-2.6-omap-h63xx.git

sync isp1301_omap with mainlne

Sync OMAP git with mainline ... build tested.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index aa08b018eb4..e0d56ef2bcb 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -32,7 +32,6 @@
 #include <linux/usb/otg.h>
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
-#include <linux/io.h>
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>