From 723298b042787548dd3fcf70ecad914c9ec62b99 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew@wil.cx>
Date: Wed, 11 Oct 2006 01:22:01 -0700
Subject: [PATCH] --- yaml --- r: 39351 b: refs/heads/master c:
 53d5ed627df852ba8bab7f70df25290bd733792c h: refs/heads/master i:   39349:
 452dba5eb0413823bddd2286389166d2afba9f2f   39347:
 858bcbfefe339add6f494a09c233122c061e134e   39343:
 6fbb8b0d149cbb3e45834e3de2a220fdcc68edb9 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/block/xd.c                | 2 +-
 trunk/drivers/input/misc/wistron_btns.c | 2 +-
 trunk/drivers/net/eth16i.c              | 2 +-
 trunk/drivers/scsi/aha152x.c            | 2 +-
 trunk/drivers/scsi/dtc.c                | 2 +-
 trunk/drivers/scsi/fdomain.c            | 2 +-
 trunk/drivers/scsi/seagate.c            | 2 +-
 trunk/drivers/scsi/t128.c               | 2 +-
 trunk/drivers/scsi/wd7000.c             | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d95353ed2e89..f8212255aae9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c58165108e26d18849a0138c719e680f281197a
+refs/heads/master: 53d5ed627df852ba8bab7f70df25290bd733792c
diff --git a/trunk/drivers/block/xd.c b/trunk/drivers/block/xd.c
index 10cc38783bdf..0d97b7eb818a 100644
--- a/trunk/drivers/block/xd.c
+++ b/trunk/drivers/block/xd.c
@@ -48,9 +48,9 @@
 #include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/delay.h>
+#include <linux/io.h>
 
 #include <asm/system.h>
-#include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/dma.h>
 
diff --git a/trunk/drivers/input/misc/wistron_btns.c b/trunk/drivers/input/misc/wistron_btns.c
index 4639537336fc..7b9d1c1da41a 100644
--- a/trunk/drivers/input/misc/wistron_btns.c
+++ b/trunk/drivers/input/misc/wistron_btns.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/dmi.h>
 #include <linux/init.h>
 #include <linux/input.h>
diff --git a/trunk/drivers/net/eth16i.c b/trunk/drivers/net/eth16i.c
index 8cc3c331aca8..b7b8bc2a6307 100644
--- a/trunk/drivers/net/eth16i.c
+++ b/trunk/drivers/net/eth16i.c
@@ -162,9 +162,9 @@ static char *version =
 #include <linux/skbuff.h>
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
+#include <linux/io.h>
 
 #include <asm/system.h>
-#include <asm/io.h>
 #include <asm/dma.h>
 
 
diff --git a/trunk/drivers/scsi/aha152x.c b/trunk/drivers/scsi/aha152x.c
index a0d1cee0be77..306f46b85a55 100644
--- a/trunk/drivers/scsi/aha152x.c
+++ b/trunk/drivers/scsi/aha152x.c
@@ -238,7 +238,7 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <asm/irq.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/blkdev.h>
 #include <asm/system.h>
 #include <linux/errno.h>
diff --git a/trunk/drivers/scsi/dtc.c b/trunk/drivers/scsi/dtc.c
index 0d5713dfa204..54756722dd5f 100644
--- a/trunk/drivers/scsi/dtc.c
+++ b/trunk/drivers/scsi/dtc.c
@@ -82,7 +82,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include "dtc.h"
diff --git a/trunk/drivers/scsi/fdomain.c b/trunk/drivers/scsi/fdomain.c
index 41b05fc45380..72794a7b6dcc 100644
--- a/trunk/drivers/scsi/fdomain.c
+++ b/trunk/drivers/scsi/fdomain.c
@@ -278,9 +278,9 @@
 #include <linux/pci.h>
 #include <linux/stat.h>
 #include <linux/delay.h>
+#include <linux/io.h>
 #include <scsi/scsicam.h>
 
-#include <asm/io.h>
 #include <asm/system.h>
 
 #include <scsi/scsi.h>
diff --git a/trunk/drivers/scsi/seagate.c b/trunk/drivers/scsi/seagate.c
index 8ff1f2866f7b..5ffec2721b28 100644
--- a/trunk/drivers/scsi/seagate.c
+++ b/trunk/drivers/scsi/seagate.c
@@ -97,8 +97,8 @@
 #include <linux/blkdev.h>
 #include <linux/stat.h>
 #include <linux/delay.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
diff --git a/trunk/drivers/scsi/t128.c b/trunk/drivers/scsi/t128.c
index 2df6747cb76f..0b7a70f61e0d 100644
--- a/trunk/drivers/scsi/t128.c
+++ b/trunk/drivers/scsi/t128.c
@@ -109,7 +109,7 @@
 #include <asm/system.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/stat.h>
diff --git a/trunk/drivers/scsi/wd7000.c b/trunk/drivers/scsi/wd7000.c
index 331e1cf159b0..30be76514c43 100644
--- a/trunk/drivers/scsi/wd7000.c
+++ b/trunk/drivers/scsi/wd7000.c
@@ -178,10 +178,10 @@
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/stat.h>
+#include <linux/io.h>
 
 #include <asm/system.h>
 #include <asm/dma.h>
-#include <asm/io.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>