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

[pandora-kernel.git] / drivers / scsi / pluto.c

diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c
index 7bb0a2e..c89da7d 100644 (file)
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
@@ -45,7 +45,7 @@ static struct ctrl_inquiry {
        Scsi_Cmnd cmd;
        char inquiry[256];
        fc_channel *fc;
-} *fcs __initdata = { 0 };
+} *fcs __initdata;
 static int fcscount __initdata = 0;
 static atomic_t fcss __initdata = ATOMIC_INIT(0);
 DECLARE_MUTEX_LOCKED(fc_sem);
@@ -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,
 };