aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-03-28 13:30:03 -0400
committerDavid Howells <dhowells@redhat.com>2012-03-28 13:30:03 -0400
commit9ffc93f203c18a70623f21950f1dd473c9ec48cd (patch)
tree1eb3536ae183b0bfbf7f5152a6fe4f430ae881c2 /drivers/scsi
parent96f951edb1f1bdbbc99b0cd458f9808bb83d58ae (diff)
Remove all #inclusions of asm/system.h
Remove all #inclusions of asm/system.h preparatory to splitting and killing it. Performed with the following command: perl -p -i -e 's!^#\s*include\s*<asm/system[.]h>.*\n!!' `grep -Irl '^#\s*include\s*<asm/system[.]h>' *` Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/53c700.c1
-rw-r--r--drivers/scsi/BusLogic.c1
-rw-r--r--drivers/scsi/advansys.c1
-rw-r--r--drivers/scsi/aha152x.c1
-rw-r--r--drivers/scsi/aha1542.c1
-rw-r--r--drivers/scsi/aha1740.c1
-rw-r--r--drivers/scsi/arcmsr/arcmsr_hba.c1
-rw-r--r--drivers/scsi/arm/acornscsi.c1
-rw-r--r--drivers/scsi/arm/cumana_1.c1
-rw-r--r--drivers/scsi/arm/oak.c1
-rw-r--r--drivers/scsi/atp870u.c1
-rw-r--r--drivers/scsi/dtc.c1
-rw-r--r--drivers/scsi/fd_mcs.c1
-rw-r--r--drivers/scsi/fdomain.c1
-rw-r--r--drivers/scsi/g_NCR5380.c1
-rw-r--r--drivers/scsi/gdth.c1
-rw-r--r--drivers/scsi/ibmmca.c1
-rw-r--r--drivers/scsi/in2000.c1
-rw-r--r--drivers/scsi/mac53c94.c1
-rw-r--r--drivers/scsi/mac_scsi.c1
-rw-r--r--drivers/scsi/mesh.c1
-rw-r--r--drivers/scsi/ncr53c8xx.c1
-rw-r--r--drivers/scsi/nsp32.c1
-rw-r--r--drivers/scsi/osst.c1
-rw-r--r--drivers/scsi/pas16.c1
-rw-r--r--drivers/scsi/qla1280.c1
-rw-r--r--drivers/scsi/qlogicpti.c1
-rw-r--r--drivers/scsi/st.c1
-rw-r--r--drivers/scsi/sun3_scsi.c1
-rw-r--r--drivers/scsi/sun3_scsi_vme.c1
-rw-r--r--drivers/scsi/sym53c416.c1
-rw-r--r--drivers/scsi/t128.c1
-rw-r--r--drivers/scsi/u14-34f.c1
-rw-r--r--drivers/scsi/ultrastor.c1
-rw-r--r--drivers/scsi/wd7000.c1
35 files changed, 0 insertions, 35 deletions
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index f672491774eb..a3adfb4357f5 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -129,7 +129,6 @@
129#include <linux/interrupt.h> 129#include <linux/interrupt.h>
130#include <linux/device.h> 130#include <linux/device.h>
131#include <asm/dma.h> 131#include <asm/dma.h>
132#include <asm/system.h>
133#include <asm/io.h> 132#include <asm/io.h>
134#include <asm/pgtable.h> 133#include <asm/pgtable.h>
135#include <asm/byteorder.h> 134#include <asm/byteorder.h>
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index f66c33b9ab41..d4da3708763b 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -47,7 +47,6 @@
47 47
48#include <asm/dma.h> 48#include <asm/dma.h>
49#include <asm/io.h> 49#include <asm/io.h>
50#include <asm/system.h>
51 50
52#include <scsi/scsi.h> 51#include <scsi/scsi.h>
53#include <scsi/scsi_cmnd.h> 52#include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index bfd618a69499..374c4edf4fcb 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -41,7 +41,6 @@
41#include <linux/firmware.h> 41#include <linux/firmware.h>
42 42
43#include <asm/io.h> 43#include <asm/io.h>
44#include <asm/system.h>
45#include <asm/dma.h> 44#include <asm/dma.h>
46 45
47#include <scsi/scsi_cmnd.h> 46#include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index f17c92cf808b..19a36945e6fd 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -239,7 +239,6 @@
239#include <asm/irq.h> 239#include <asm/irq.h>
240#include <linux/io.h> 240#include <linux/io.h>
241#include <linux/blkdev.h> 241#include <linux/blkdev.h>
242#include <asm/system.h>
243#include <linux/completion.h> 242#include <linux/completion.h>
244#include <linux/errno.h> 243#include <linux/errno.h>
245#include <linux/string.h> 244#include <linux/string.h>
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index ed119cedaae0..ede91f378000 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -42,7 +42,6 @@
42#include <linux/slab.h> 42#include <linux/slab.h>
43 43
44#include <asm/dma.h> 44#include <asm/dma.h>
45#include <asm/system.h>
46#include <asm/io.h> 45#include <asm/io.h>
47 46
48#include "scsi.h" 47#include "scsi.h"
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index 1c10b796c1a2..a3e6ed353917 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -53,7 +53,6 @@
53#include <linux/gfp.h> 53#include <linux/gfp.h>
54 54
55#include <asm/dma.h> 55#include <asm/dma.h>
56#include <asm/system.h>
57#include <asm/io.h> 56#include <asm/io.h>
58 57
59#include "scsi.h" 58#include "scsi.h"
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 2fe9e90e53d9..cbde1dca45ad 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -61,7 +61,6 @@
61#include <linux/aer.h> 61#include <linux/aer.h>
62#include <asm/dma.h> 62#include <asm/dma.h>
63#include <asm/io.h> 63#include <asm/io.h>
64#include <asm/system.h>
65#include <asm/uaccess.h> 64#include <asm/uaccess.h>
66#include <scsi/scsi_host.h> 65#include <scsi/scsi_host.h>
67#include <scsi/scsi.h> 66#include <scsi/scsi.h>
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index c454e44cf51c..b330438ac662 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -138,7 +138,6 @@
138#include <linux/stringify.h> 138#include <linux/stringify.h>
139#include <linux/io.h> 139#include <linux/io.h>
140 140
141#include <asm/system.h>
142#include <asm/ecard.h> 141#include <asm/ecard.h>
143 142
144#include "../scsi.h" 143#include "../scsi.h"
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index a3398fe70a9c..c3b99c93637a 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -12,7 +12,6 @@
12 12
13#include <asm/ecard.h> 13#include <asm/ecard.h>
14#include <asm/io.h> 14#include <asm/io.h>
15#include <asm/system.h>
16 15
17#include "../scsi.h" 16#include "../scsi.h"
18#include <scsi/scsi_host.h> 17#include <scsi/scsi_host.h>
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index 849cdf89f7bb..d25f944b59c2 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -13,7 +13,6 @@
13 13
14#include <asm/ecard.h> 14#include <asm/ecard.h>
15#include <asm/io.h> 15#include <asm/io.h>
16#include <asm/system.h>
17 16
18#include "../scsi.h" 17#include "../scsi.h"
19#include <scsi/scsi_host.h> 18#include <scsi/scsi_host.h>
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index 7e6eca4a125e..f29d5121d5ed 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -30,7 +30,6 @@
30#include <linux/blkdev.h> 30#include <linux/blkdev.h>
31#include <linux/dma-mapping.h> 31#include <linux/dma-mapping.h>
32#include <linux/slab.h> 32#include <linux/slab.h>
33#include <asm/system.h>
34#include <asm/io.h> 33#include <asm/io.h>
35 34
36#include <scsi/scsi.h> 35#include <scsi/scsi.h>
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index c2677ba29c74..4b11bb04f5c4 100644
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -72,7 +72,6 @@
72#endif 72#endif
73 73
74 74
75#include <asm/system.h>
76#include <linux/module.h> 75#include <linux/module.h>
77#include <linux/signal.h> 76#include <linux/signal.h>
78#include <linux/blkdev.h> 77#include <linux/blkdev.h>
diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c
index a2c6135d337e..53bfcaa86f09 100644
--- a/drivers/scsi/fd_mcs.c
+++ b/drivers/scsi/fd_mcs.c
@@ -93,7 +93,6 @@
93#include <linux/mca-legacy.h> 93#include <linux/mca-legacy.h>
94 94
95#include <asm/io.h> 95#include <asm/io.h>
96#include <asm/system.h>
97 96
98#include "scsi.h" 97#include "scsi.h"
99#include <scsi/scsi_host.h> 98#include <scsi/scsi_host.h>
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index 643f6d500fe7..1a2a1e5824e3 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -282,7 +282,6 @@
282#include <linux/slab.h> 282#include <linux/slab.h>
283#include <scsi/scsicam.h> 283#include <scsi/scsicam.h>
284 284
285#include <asm/system.h>
286 285
287#include <scsi/scsi.h> 286#include <scsi/scsi.h>
288#include <scsi/scsi_cmnd.h> 287#include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 81182badfeb1..1a5954f0915a 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -100,7 +100,6 @@
100#undef NCR5380_STAT_LIMIT 100#undef NCR5380_STAT_LIMIT
101#endif 101#endif
102 102
103#include <asm/system.h>
104#include <asm/io.h> 103#include <asm/io.h>
105#include <linux/signal.h> 104#include <linux/signal.h>
106#include <linux/blkdev.h> 105#include <linux/blkdev.h>
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index d42ec921de46..5d72274c507f 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -129,7 +129,6 @@
129#include <linux/reboot.h> 129#include <linux/reboot.h>
130 130
131#include <asm/dma.h> 131#include <asm/dma.h>
132#include <asm/system.h>
133#include <asm/io.h> 132#include <asm/io.h>
134#include <asm/uaccess.h> 133#include <asm/uaccess.h>
135#include <linux/spinlock.h> 134#include <linux/spinlock.h>
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index 67fc8ffd52e6..cd09132d5d7d 100644
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -32,7 +32,6 @@
32#include <linux/spinlock.h> 32#include <linux/spinlock.h>
33#include <linux/init.h> 33#include <linux/init.h>
34 34
35#include <asm/system.h>
36#include <asm/io.h> 35#include <asm/io.h>
37 36
38#include "scsi.h" 37#include "scsi.h"
diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c
index 112f1bec7756..deb5b6d8398e 100644
--- a/drivers/scsi/in2000.c
+++ b/drivers/scsi/in2000.c
@@ -123,7 +123,6 @@
123#include <linux/stat.h> 123#include <linux/stat.h>
124 124
125#include <asm/io.h> 125#include <asm/io.h>
126#include <asm/system.h>
127 126
128#include "scsi.h" 127#include "scsi.h"
129#include <scsi/scsi_host.h> 128#include <scsi/scsi_host.h>
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index e6173376605d..e5cd8d8d4ce7 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -22,7 +22,6 @@
22#include <asm/io.h> 22#include <asm/io.h>
23#include <asm/pgtable.h> 23#include <asm/pgtable.h>
24#include <asm/prom.h> 24#include <asm/prom.h>
25#include <asm/system.h>
26#include <asm/pci-bridge.h> 25#include <asm/pci-bridge.h>
27#include <asm/macio.h> 26#include <asm/macio.h>
28 27
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 2bccfbe5661e..24828b54773a 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -43,7 +43,6 @@
43 43
44#include <asm/io.h> 44#include <asm/io.h>
45#include <asm/irq.h> 45#include <asm/irq.h>
46#include <asm/system.h>
47 46
48#include <asm/macintosh.h> 47#include <asm/macintosh.h>
49#include <asm/macints.h> 48#include <asm/macints.h>
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index 494474779532..e8a04ae3276a 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -33,7 +33,6 @@
33#include <asm/io.h> 33#include <asm/io.h>
34#include <asm/pgtable.h> 34#include <asm/pgtable.h>
35#include <asm/prom.h> 35#include <asm/prom.h>
36#include <asm/system.h>
37#include <asm/irq.h> 36#include <asm/irq.h>
38#include <asm/hydra.h> 37#include <asm/hydra.h>
39#include <asm/processor.h> 38#include <asm/processor.h>
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index 4b3b4755945c..5982a587babc 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -115,7 +115,6 @@
115 115
116#include <asm/dma.h> 116#include <asm/dma.h>
117#include <asm/io.h> 117#include <asm/io.h>
118#include <asm/system.h>
119 118
120#include <scsi/scsi.h> 119#include <scsi/scsi.h>
121#include <scsi/scsi_cmnd.h> 120#include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 002924963cd8..62b616891a33 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -38,7 +38,6 @@
38#include <linux/dma-mapping.h> 38#include <linux/dma-mapping.h>
39 39
40#include <asm/dma.h> 40#include <asm/dma.h>
41#include <asm/system.h>
42#include <asm/io.h> 41#include <asm/io.h>
43 42
44#include <scsi/scsi.h> 43#include <scsi/scsi.h>
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index de0b1a704fb5..21883a2d6324 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -54,7 +54,6 @@ static const char * osst_version = "0.99.4";
54#include <linux/mutex.h> 54#include <linux/mutex.h>
55#include <asm/uaccess.h> 55#include <asm/uaccess.h>
56#include <asm/dma.h> 56#include <asm/dma.h>
57#include <asm/system.h>
58 57
59/* The driver prints some debugging information on the console if DEBUG 58/* The driver prints some debugging information on the console if DEBUG
60 is defined and non-zero. */ 59 is defined and non-zero. */
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index f2018b46f494..2f72c9807b12 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -113,7 +113,6 @@
113 113
114#include <linux/module.h> 114#include <linux/module.h>
115 115
116#include <asm/system.h>
117#include <linux/signal.h> 116#include <linux/signal.h>
118#include <linux/proc_fs.h> 117#include <linux/proc_fs.h>
119#include <asm/io.h> 118#include <asm/io.h>
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index d838205ab169..6c6486f626ee 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -359,7 +359,6 @@
359#include <asm/byteorder.h> 359#include <asm/byteorder.h>
360#include <asm/processor.h> 360#include <asm/processor.h>
361#include <asm/types.h> 361#include <asm/types.h>
362#include <asm/system.h>
363 362
364#include <scsi/scsi.h> 363#include <scsi/scsi.h>
365#include <scsi/scsi_cmnd.h> 364#include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index e40dc1cb09a0..b191dd549207 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -35,7 +35,6 @@
35#include "qlogicpti.h" 35#include "qlogicpti.h"
36 36
37#include <asm/dma.h> 37#include <asm/dma.h>
38#include <asm/system.h>
39#include <asm/ptrace.h> 38#include <asm/ptrace.h>
40#include <asm/pgtable.h> 39#include <asm/pgtable.h>
41#include <asm/oplib.h> 40#include <asm/oplib.h>
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 9262cdfa4b23..a15f691f9d34 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -42,7 +42,6 @@ static const char *verstr = "20101219";
42 42
43#include <asm/uaccess.h> 43#include <asm/uaccess.h>
44#include <asm/dma.h> 44#include <asm/dma.h>
45#include <asm/system.h>
46 45
47#include <scsi/scsi.h> 46#include <scsi/scsi.h>
48#include <scsi/scsi_dbg.h> 47#include <scsi/scsi_dbg.h>
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index baf7328de956..6e25889db9d4 100644
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -63,7 +63,6 @@
63#include <linux/blkdev.h> 63#include <linux/blkdev.h>
64 64
65#include <asm/io.h> 65#include <asm/io.h>
66#include <asm/system.h>
67 66
68#include <asm/sun3ints.h> 67#include <asm/sun3ints.h>
69#include <asm/dvma.h> 68#include <asm/dvma.h>
diff --git a/drivers/scsi/sun3_scsi_vme.c b/drivers/scsi/sun3_scsi_vme.c
index fbba78e5722e..a3dd55d1d2fd 100644
--- a/drivers/scsi/sun3_scsi_vme.c
+++ b/drivers/scsi/sun3_scsi_vme.c
@@ -25,7 +25,6 @@
25#include <linux/blkdev.h> 25#include <linux/blkdev.h>
26 26
27#include <asm/io.h> 27#include <asm/io.h>
28#include <asm/system.h>
29 28
30#include <asm/sun3ints.h> 29#include <asm/sun3ints.h>
31#include <asm/dvma.h> 30#include <asm/dvma.h>
diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c
index 012c86edd59f..ac4eca6a5328 100644
--- a/drivers/scsi/sym53c416.c
+++ b/drivers/scsi/sym53c416.c
@@ -37,7 +37,6 @@
37#include <linux/proc_fs.h> 37#include <linux/proc_fs.h>
38#include <linux/spinlock.h> 38#include <linux/spinlock.h>
39#include <asm/dma.h> 39#include <asm/dma.h>
40#include <asm/system.h>
41#include <asm/io.h> 40#include <asm/io.h>
42#include <linux/blkdev.h> 41#include <linux/blkdev.h>
43#include <linux/isapnp.h> 42#include <linux/isapnp.h>
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index 041eaaace2c3..d672d97fb84a 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -106,7 +106,6 @@
106 * $Log: t128.c,v $ 106 * $Log: t128.c,v $
107 */ 107 */
108 108
109#include <asm/system.h>
110#include <linux/signal.h> 109#include <linux/signal.h>
111#include <linux/io.h> 110#include <linux/io.h>
112#include <linux/blkdev.h> 111#include <linux/blkdev.h>
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c
index 90e104d6b558..9c216e563568 100644
--- a/drivers/scsi/u14-34f.c
+++ b/drivers/scsi/u14-34f.c
@@ -410,7 +410,6 @@
410#include <linux/ioport.h> 410#include <linux/ioport.h>
411#include <linux/delay.h> 411#include <linux/delay.h>
412#include <asm/io.h> 412#include <asm/io.h>
413#include <asm/system.h>
414#include <asm/byteorder.h> 413#include <asm/byteorder.h>
415#include <linux/proc_fs.h> 414#include <linux/proc_fs.h>
416#include <linux/blkdev.h> 415#include <linux/blkdev.h>
diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c
index 7e22b737dfd8..14e0c40a68c9 100644
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -141,7 +141,6 @@
141#include <linux/delay.h> 141#include <linux/delay.h>
142 142
143#include <asm/io.h> 143#include <asm/io.h>
144#include <asm/system.h>
145#include <asm/dma.h> 144#include <asm/dma.h>
146 145
147#define ULTRASTOR_PRIVATE /* Get the private stuff from ultrastor.h */ 146#define ULTRASTOR_PRIVATE /* Get the private stuff from ultrastor.h */
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index 9ee0afef2d16..d89a5dfd3ade 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -179,7 +179,6 @@
179#include <linux/stat.h> 179#include <linux/stat.h>
180#include <linux/io.h> 180#include <linux/io.h>
181 181
182#include <asm/system.h>
183#include <asm/dma.h> 182#include <asm/dma.h>
184 183
185#include <scsi/scsi.h> 184#include <scsi/scsi.h>