Merge master.kernel.org:/home/rmk/linux-2.6-serial

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

diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c
index c01b7191fcf59cabfbd6f0b56238ef81665d8f25..c89da7d5b6dffb49cf9994c7a59540abf8eea5bc 100644 (file)
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
@@ -95,8 +95,7 @@ int __init pluto_detect(Scsi_Host_Template *tpnt)
        int i, retry, nplutos;
        fc_channel *fc;
        Scsi_Device dev;
-       struct timer_list fc_timer =
-               TIMER_INITIALIZER(pluto_detect_timeout, 0, 0);
+       DEFINE_TIMER(fc_timer, pluto_detect_timeout, 0, 0);
 
        tpnt->proc_name = "pluto";
        fcscount = 0;
@@ -354,7 +353,6 @@ static Scsi_Host_Template driver_template = {
        .use_clustering         = ENABLE_CLUSTERING,
        .eh_abort_handler       = fcp_scsi_abort,
        .eh_device_reset_handler = fcp_scsi_dev_reset,
-       .eh_bus_reset_handler   = fcp_scsi_bus_reset,
        .eh_host_reset_handler  = fcp_scsi_host_reset,
 };