The patch titled
Use linux/io.h instead of asm/io.h
has been added to the -mm tree. Its filename is
use-linux-ioh-instead-of-asm-ioh.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Use linux/io.h instead of asm/io.h
From: Matthew Wilcox <matthew@xxxxxx>
In preparation for moving check_signature, change these users from asm/io.h
to linux/io.h
Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/block/xd.c | 2 +-
drivers/input/misc/wistron_btns.c | 2 +-
drivers/net/eth16i.c | 2 +-
drivers/scsi/aha152x.c | 2 +-
drivers/scsi/dtc.c | 2 +-
drivers/scsi/fdomain.c | 2 +-
drivers/scsi/seagate.c | 2 +-
drivers/scsi/t128.c | 2 +-
drivers/scsi/wd7000.c | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff -puN drivers/block/xd.c~use-linux-ioh-instead-of-asm-ioh drivers/block/xd.c
--- a/drivers/block/xd.c~use-linux-ioh-instead-of-asm-ioh
+++ a/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 -puN drivers/input/misc/wistron_btns.c~use-linux-ioh-instead-of-asm-ioh drivers/input/misc/wistron_btns.c
--- a/drivers/input/misc/wistron_btns.c~use-linux-ioh-instead-of-asm-ioh
+++ a/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 -puN drivers/net/eth16i.c~use-linux-ioh-instead-of-asm-ioh drivers/net/eth16i.c
--- a/drivers/net/eth16i.c~use-linux-ioh-instead-of-asm-ioh
+++ a/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 -puN drivers/scsi/aha152x.c~use-linux-ioh-instead-of-asm-ioh drivers/scsi/aha152x.c
--- a/drivers/scsi/aha152x.c~use-linux-ioh-instead-of-asm-ioh
+++ a/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 -puN drivers/scsi/dtc.c~use-linux-ioh-instead-of-asm-ioh drivers/scsi/dtc.c
--- a/drivers/scsi/dtc.c~use-linux-ioh-instead-of-asm-ioh
+++ a/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 -puN drivers/scsi/fdomain.c~use-linux-ioh-instead-of-asm-ioh drivers/scsi/fdomain.c
--- a/drivers/scsi/fdomain.c~use-linux-ioh-instead-of-asm-ioh
+++ a/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 -puN drivers/scsi/seagate.c~use-linux-ioh-instead-of-asm-ioh drivers/scsi/seagate.c
--- a/drivers/scsi/seagate.c~use-linux-ioh-instead-of-asm-ioh
+++ a/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 -puN drivers/scsi/t128.c~use-linux-ioh-instead-of-asm-ioh drivers/scsi/t128.c
--- a/drivers/scsi/t128.c~use-linux-ioh-instead-of-asm-ioh
+++ a/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 -puN drivers/scsi/wd7000.c~use-linux-ioh-instead-of-asm-ioh drivers/scsi/wd7000.c
--- a/drivers/scsi/wd7000.c~use-linux-ioh-instead-of-asm-ioh
+++ a/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>
_
Patches currently in -mm which might be from matthew@xxxxxx are
use-linux-ioh-instead-of-asm-ioh.patch
consolidate-check_signature.patch
make-sure-nobodys-leaking-resources.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
