Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

[karo-tx-linux.git] / drivers / scsi / dc395x.c

diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index e351db6c00779873a6f94bb7002118501c8b847c..6c59c02c1ed9959e487e54258a1dd5f966742976 100644 (file)
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -1509,7 +1509,7 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb,
                 * Try anyway?
                 *
                 * We could, BUT: Sometimes the TRM_S1040 misses to produce a Selection
-                * Timeout, a Disconnect or a Reselction IRQ, so we would be screwed!
+                * Timeout, a Disconnect or a Reselection IRQ, so we would be screwed!
                 * (This is likely to be a bug in the hardware. Obviously, most people
                 *  only have one initiator per SCSI bus.)
                 * Instead let this fail and have the timer make sure the command is 
@@ -4761,7 +4761,6 @@ static struct scsi_host_template dc395x_driver_template = {
        .cmd_per_lun            = DC395x_MAX_CMD_PER_LUN,
        .eh_abort_handler       = dc395x_eh_abort,
        .eh_bus_reset_handler   = dc395x_eh_bus_reset,
-       .unchecked_isa_dma      = 0,
        .use_clustering         = DISABLE_CLUSTERING,
 };