diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 00:41:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 00:41:18 -0500 |
| commit | 98a5d024eb589a863c1c79f3c3f8ecb666c0eec9 (patch) | |
| tree | 456799ad9fce41cdb2186ba3872c7a077ec3bd05 /drivers/ide/ppc/pmac.c | |
| parent | d67e7ebb2a15bf0429c55f2fc1c4b02808367874 (diff) | |
| parent | 1b15688b31d8c88881102426279e8cc03953860b (diff) | |
| download | talos-op-linux-98a5d024eb589a863c1c79f3c3f8ecb666c0eec9.tar.gz talos-op-linux-98a5d024eb589a863c1c79f3c3f8ecb666c0eec9.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
| -rw-r--r-- | drivers/ide/ppc/pmac.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 136911a86e84..16b28357885b 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -1401,20 +1401,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) /* We probe the hwif now */ probe_hwif_init(hwif); - /* The code IDE code will have set hwif->present if we have devices attached, - * if we don't, the discard the interface except if we are on a media bay slot - */ - if (!hwif->present && !pmif->mediabay) { - printk(KERN_INFO "ide%d: Bus empty, interface released.\n", - hwif->index); - default_hwif_iops(hwif); - for (i = IDE_DATA_OFFSET; i <= IDE_CONTROL_OFFSET; ++i) - hwif->io_ports[i] = 0; - hwif->chipset = ide_unknown; - hwif->noprobe = 1; - return -ENODEV; - } - return 0; } |
