diff options
author | Matthew Wilcox <matthew@wil.cx> | 2006-10-11 04:22:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:14:23 -0400 |
commit | 53d5ed627df852ba8bab7f70df25290bd733792c (patch) | |
tree | 58bb781ce111451281ed24d858020b49c278d0a5 | |
parent | 8c58165108e26d18849a0138c719e680f281197a (diff) |
[PATCH] Use linux/io.h instead of asm/io.h
In preparation for moving check_signature, change these users from asm/io.h
to linux/io.h
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/block/xd.c | 2 | ||||
-rw-r--r-- | drivers/input/misc/wistron_btns.c | 2 | ||||
-rw-r--r-- | drivers/net/eth16i.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aha152x.c | 2 | ||||
-rw-r--r-- | drivers/scsi/dtc.c | 2 | ||||
-rw-r--r-- | drivers/scsi/fdomain.c | 2 | ||||
-rw-r--r-- | drivers/scsi/seagate.c | 2 | ||||
-rw-r--r-- | drivers/scsi/t128.c | 2 | ||||
-rw-r--r-- | drivers/scsi/wd7000.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/drivers/block/xd.c b/drivers/block/xd.c index 10cc38783bdf..0d97b7eb818a 100644 --- a/drivers/block/xd.c +++ b/drivers/block/xd.c | |||
@@ -48,9 +48,9 @@ | |||
48 | #include <linux/blkdev.h> | 48 | #include <linux/blkdev.h> |
49 | #include <linux/blkpg.h> | 49 | #include <linux/blkpg.h> |
50 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
51 | #include <linux/io.h> | ||
51 | 52 | ||
52 | #include <asm/system.h> | 53 | #include <asm/system.h> |
53 | #include <asm/io.h> | ||
54 | #include <asm/uaccess.h> | 54 | #include <asm/uaccess.h> |
55 | #include <asm/dma.h> | 55 | #include <asm/dma.h> |
56 | 56 | ||
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index 4639537336fc..7b9d1c1da41a 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | 17 | * with this program; if not, write to the Free Software Foundation, Inc., |
18 | * 59 Temple Place Suite 330, Boston, MA 02111-1307, USA. | 18 | * 59 Temple Place Suite 330, Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | #include <asm/io.h> | 20 | #include <linux/io.h> |
21 | #include <linux/dmi.h> | 21 | #include <linux/dmi.h> |
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/input.h> | 23 | #include <linux/input.h> |
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index 8cc3c331aca8..b7b8bc2a6307 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c | |||
@@ -162,9 +162,9 @@ static char *version = | |||
162 | #include <linux/skbuff.h> | 162 | #include <linux/skbuff.h> |
163 | #include <linux/bitops.h> | 163 | #include <linux/bitops.h> |
164 | #include <linux/jiffies.h> | 164 | #include <linux/jiffies.h> |
165 | #include <linux/io.h> | ||
165 | 166 | ||
166 | #include <asm/system.h> | 167 | #include <asm/system.h> |
167 | #include <asm/io.h> | ||
168 | #include <asm/dma.h> | 168 | #include <asm/dma.h> |
169 | 169 | ||
170 | 170 | ||
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index a0d1cee0be77..306f46b85a55 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c | |||
@@ -238,7 +238,7 @@ | |||
238 | #include <linux/module.h> | 238 | #include <linux/module.h> |
239 | #include <linux/sched.h> | 239 | #include <linux/sched.h> |
240 | #include <asm/irq.h> | 240 | #include <asm/irq.h> |
241 | #include <asm/io.h> | 241 | #include <linux/io.h> |
242 | #include <linux/blkdev.h> | 242 | #include <linux/blkdev.h> |
243 | #include <asm/system.h> | 243 | #include <asm/system.h> |
244 | #include <linux/errno.h> | 244 | #include <linux/errno.h> |
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c index 0d5713dfa204..54756722dd5f 100644 --- a/drivers/scsi/dtc.c +++ b/drivers/scsi/dtc.c | |||
@@ -82,7 +82,7 @@ | |||
82 | #include <linux/string.h> | 82 | #include <linux/string.h> |
83 | #include <linux/init.h> | 83 | #include <linux/init.h> |
84 | #include <linux/interrupt.h> | 84 | #include <linux/interrupt.h> |
85 | #include <asm/io.h> | 85 | #include <linux/io.h> |
86 | #include "scsi.h" | 86 | #include "scsi.h" |
87 | #include <scsi/scsi_host.h> | 87 | #include <scsi/scsi_host.h> |
88 | #include "dtc.h" | 88 | #include "dtc.h" |
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c index 41b05fc45380..72794a7b6dcc 100644 --- a/drivers/scsi/fdomain.c +++ b/drivers/scsi/fdomain.c | |||
@@ -278,9 +278,9 @@ | |||
278 | #include <linux/pci.h> | 278 | #include <linux/pci.h> |
279 | #include <linux/stat.h> | 279 | #include <linux/stat.h> |
280 | #include <linux/delay.h> | 280 | #include <linux/delay.h> |
281 | #include <linux/io.h> | ||
281 | #include <scsi/scsicam.h> | 282 | #include <scsi/scsicam.h> |
282 | 283 | ||
283 | #include <asm/io.h> | ||
284 | #include <asm/system.h> | 284 | #include <asm/system.h> |
285 | 285 | ||
286 | #include <scsi/scsi.h> | 286 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c index 8ff1f2866f7b..5ffec2721b28 100644 --- a/drivers/scsi/seagate.c +++ b/drivers/scsi/seagate.c | |||
@@ -97,8 +97,8 @@ | |||
97 | #include <linux/blkdev.h> | 97 | #include <linux/blkdev.h> |
98 | #include <linux/stat.h> | 98 | #include <linux/stat.h> |
99 | #include <linux/delay.h> | 99 | #include <linux/delay.h> |
100 | #include <linux/io.h> | ||
100 | 101 | ||
101 | #include <asm/io.h> | ||
102 | #include <asm/system.h> | 102 | #include <asm/system.h> |
103 | #include <asm/uaccess.h> | 103 | #include <asm/uaccess.h> |
104 | 104 | ||
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c index 2df6747cb76f..0b7a70f61e0d 100644 --- a/drivers/scsi/t128.c +++ b/drivers/scsi/t128.c | |||
@@ -109,7 +109,7 @@ | |||
109 | #include <asm/system.h> | 109 | #include <asm/system.h> |
110 | #include <linux/signal.h> | 110 | #include <linux/signal.h> |
111 | #include <linux/sched.h> | 111 | #include <linux/sched.h> |
112 | #include <asm/io.h> | 112 | #include <linux/io.h> |
113 | #include <linux/blkdev.h> | 113 | #include <linux/blkdev.h> |
114 | #include <linux/interrupt.h> | 114 | #include <linux/interrupt.h> |
115 | #include <linux/stat.h> | 115 | #include <linux/stat.h> |
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c index 331e1cf159b0..30be76514c43 100644 --- a/drivers/scsi/wd7000.c +++ b/drivers/scsi/wd7000.c | |||
@@ -178,10 +178,10 @@ | |||
178 | #include <linux/blkdev.h> | 178 | #include <linux/blkdev.h> |
179 | #include <linux/init.h> | 179 | #include <linux/init.h> |
180 | #include <linux/stat.h> | 180 | #include <linux/stat.h> |
181 | #include <linux/io.h> | ||
181 | 182 | ||
182 | #include <asm/system.h> | 183 | #include <asm/system.h> |
183 | #include <asm/dma.h> | 184 | #include <asm/dma.h> |
184 | #include <asm/io.h> | ||
185 | 185 | ||
186 | #include <scsi/scsi.h> | 186 | #include <scsi/scsi.h> |
187 | #include <scsi/scsi_cmnd.h> | 187 | #include <scsi/scsi_cmnd.h> |