diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
| commit | c2834cf4746cf13501efc3489b1895bce58a4ccb (patch) | |
| tree | 13614c2ed7ec156d8518fd5bff4e1c252fb05792 /drivers/scsi/fdomain.c | |
| parent | 05cb784c81a0fd1f97732156ea464bd392ce875a (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/scsi/fdomain.c')
| -rw-r--r-- | drivers/scsi/fdomain.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c index 4ba6a15cf43d..aecf32dd0bde 100644 --- a/drivers/scsi/fdomain.c +++ b/drivers/scsi/fdomain.c | |||
| @@ -938,7 +938,6 @@ struct Scsi_Host *__fdomain_16x0_detect(struct scsi_host_template *tpnt ) | |||
| 938 | } | 938 | } |
| 939 | shpnt->irq = interrupt_level; | 939 | shpnt->irq = interrupt_level; |
| 940 | shpnt->io_port = port_base; | 940 | shpnt->io_port = port_base; |
| 941 | scsi_set_device(shpnt, &pdev->dev); | ||
| 942 | shpnt->n_io_port = 0x10; | 941 | shpnt->n_io_port = 0x10; |
| 943 | print_banner( shpnt ); | 942 | print_banner( shpnt ); |
| 944 | 943 | ||