diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 21:46:28 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 21:46:28 +0400 |
| commit | 2f058256cb64e346f4fb4499ff4e0f1c2791a4b4 (patch) | |
| tree | 91e06602f4d3abb6812ea8c9bc9ba4501e14c84e /drivers/scsi/fdomain.c | |
| parent | 0274aa2506fd2fe89a58dd6cd64d3b3f7b976af8 (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
| download | linux-2f058256cb64e346f4fb4499ff4e0f1c2791a4b4.tar.xz | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/fdomain.c')
| -rw-r--r-- | drivers/scsi/fdomain.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c index 4ba6a15cf43d..3b2a5bf5c43e 100644 --- a/drivers/scsi/fdomain.c +++ b/drivers/scsi/fdomain.c @@ -570,7 +570,7 @@ static void do_pause(unsigned amount) /* Pause for amount*10 milliseconds */ mdelay(10*amount); } -inline static void fdomain_make_bus_idle( void ) +static inline void fdomain_make_bus_idle( void ) { outb(0, port_base + SCSI_Cntl); outb(0, port_base + SCSI_Mode_Cntl); @@ -938,7 +938,6 @@ struct Scsi_Host *__fdomain_16x0_detect(struct scsi_host_template *tpnt ) } shpnt->irq = interrupt_level; shpnt->io_port = port_base; - scsi_set_device(shpnt, &pdev->dev); shpnt->n_io_port = 0x10; print_banner( shpnt ); |