diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /drivers/scsi/pluto.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/pluto.c')
| -rw-r--r-- | drivers/scsi/pluto.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c index 623082d3a83f..c89da7d5b6df 100644 --- a/drivers/scsi/pluto.c +++ b/drivers/scsi/pluto.c | |||
| @@ -95,8 +95,7 @@ int __init pluto_detect(Scsi_Host_Template *tpnt) | |||
| 95 | int i, retry, nplutos; | 95 | int i, retry, nplutos; |
| 96 | fc_channel *fc; | 96 | fc_channel *fc; |
| 97 | Scsi_Device dev; | 97 | Scsi_Device dev; |
| 98 | struct timer_list fc_timer = | 98 | DEFINE_TIMER(fc_timer, pluto_detect_timeout, 0, 0); |
| 99 | TIMER_INITIALIZER(pluto_detect_timeout, 0, 0); | ||
| 100 | 99 | ||
| 101 | tpnt->proc_name = "pluto"; | 100 | tpnt->proc_name = "pluto"; |
| 102 | fcscount = 0; | 101 | fcscount = 0; |