diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-04 22:42:39 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-04 22:42:39 -0500 |
| commit | 752c58a471c108d64da1676b2925dfbd83eb177e (patch) | |
| tree | fbffa0d7c54cd812950dffc16d642c9d449f4faf /drivers/scsi/wd7000.c | |
| parent | e52b29c2a637f6854d71a45646d7283d984a6dad (diff) | |
| parent | 10b1fbdb0a0ca91847a534ad26d0bc250c25b74f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/wd7000.c')
| -rw-r--r-- | drivers/scsi/wd7000.c | 2 |
1 files changed, 1 insertions, 1 deletions
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> |