diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 14:04:37 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 14:04:37 -0800 |
commit | d72d6f1b5647258e83819b51f72fe37e2b7d7965 (patch) | |
tree | d3a08af50624d9b3e2287367b7e9f5fcc93bdce5 /drivers/block/acsi.c | |
parent | 33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1 (diff) | |
parent | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (diff) | |
download | op-kernel-dev-d72d6f1b5647258e83819b51f72fe37e2b7d7965.zip op-kernel-dev-d72d6f1b5647258e83819b51f72fe37e2b7d7965.tar.gz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/block/acsi.c')
-rw-r--r-- | drivers/block/acsi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c index 0e1f34f..5d2d649 100644 --- a/drivers/block/acsi.c +++ b/drivers/block/acsi.c @@ -58,7 +58,6 @@ #include <linux/slab.h> #include <linux/interrupt.h> #include <scsi/scsi.h> /* for SCSI_IOCTL_GET_IDLUN */ -typedef void Scsi_Device; /* hack to avoid including scsi.h */ #include <scsi/scsi_ioctl.h> #include <linux/hdreg.h> /* for HDIO_GETGEO */ #include <linux/blkpg.h> |