diff options
Diffstat (limited to 'drivers/message/i2o')
-rw-r--r-- | drivers/message/i2o/i2o_scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c index c08ddac3717d..6ebf38213f9f 100644 --- a/drivers/message/i2o/i2o_scsi.c +++ b/drivers/message/i2o/i2o_scsi.c | |||
@@ -65,9 +65,7 @@ | |||
65 | #include <scsi/scsi_host.h> | 65 | #include <scsi/scsi_host.h> |
66 | #include <scsi/scsi_device.h> | 66 | #include <scsi/scsi_device.h> |
67 | #include <scsi/scsi_cmnd.h> | 67 | #include <scsi/scsi_cmnd.h> |
68 | #include <scsi/scsi_request.h> | ||
69 | #include <scsi/sg.h> | 68 | #include <scsi/sg.h> |
70 | #include <scsi/sg_request.h> | ||
71 | 69 | ||
72 | #define OSM_NAME "scsi-osm" | 70 | #define OSM_NAME "scsi-osm" |
73 | #define OSM_VERSION "1.316" | 71 | #define OSM_VERSION "1.316" |
@@ -588,6 +586,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt, | |||
588 | 586 | ||
589 | mptr = &msg->body[0]; | 587 | mptr = &msg->body[0]; |
590 | 588 | ||
589 | #if 0 /* this code can't work */ | ||
591 | #ifdef CONFIG_I2O_EXT_ADAPTEC | 590 | #ifdef CONFIG_I2O_EXT_ADAPTEC |
592 | if (c->adaptec) { | 591 | if (c->adaptec) { |
593 | u32 adpt_flags = 0; | 592 | u32 adpt_flags = 0; |
@@ -625,6 +624,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt, | |||
625 | *mptr++ = cpu_to_le32(adpt_flags | tid); | 624 | *mptr++ = cpu_to_le32(adpt_flags | tid); |
626 | } | 625 | } |
627 | #endif | 626 | #endif |
627 | #endif | ||
628 | 628 | ||
629 | msg->u.head[1] = cpu_to_le32(cmd | HOST_TID << 12 | tid); | 629 | msg->u.head[1] = cpu_to_le32(cmd | HOST_TID << 12 | tid); |
630 | msg->u.s.icntxt = cpu_to_le32(i2o_scsi_driver.context); | 630 | msg->u.s.icntxt = cpu_to_le32(i2o_scsi_driver.context); |