diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-probe.c | 7 | ||||
-rw-r--r-- | drivers/ide/setup-pci.c | 5 |
2 files changed, 1 insertions, 11 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 1b7b4c531bc2..9ebf8ae2a5e3 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1138,16 +1138,11 @@ static int init_irq (ide_hwif_t *hwif) | |||
1138 | spin_unlock_irq(&ide_lock); | 1138 | spin_unlock_irq(&ide_lock); |
1139 | } | 1139 | } |
1140 | 1140 | ||
1141 | #if !defined(__mc68000__) && !defined(CONFIG_APUS) && !defined(__sparc__) | 1141 | #if !defined(__mc68000__) && !defined(CONFIG_APUS) |
1142 | printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name, | 1142 | printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name, |
1143 | hwif->io_ports[IDE_DATA_OFFSET], | 1143 | hwif->io_ports[IDE_DATA_OFFSET], |
1144 | hwif->io_ports[IDE_DATA_OFFSET]+7, | 1144 | hwif->io_ports[IDE_DATA_OFFSET]+7, |
1145 | hwif->io_ports[IDE_CONTROL_OFFSET], hwif->irq); | 1145 | hwif->io_ports[IDE_CONTROL_OFFSET], hwif->irq); |
1146 | #elif defined(__sparc__) | ||
1147 | printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %s", hwif->name, | ||
1148 | hwif->io_ports[IDE_DATA_OFFSET], | ||
1149 | hwif->io_ports[IDE_DATA_OFFSET]+7, | ||
1150 | hwif->io_ports[IDE_CONTROL_OFFSET], __irq_itoa(hwif->irq)); | ||
1151 | #else | 1146 | #else |
1152 | printk("%s at 0x%08lx on irq %d", hwif->name, | 1147 | printk("%s at 0x%08lx on irq %d", hwif->name, |
1153 | hwif->io_ports[IDE_DATA_OFFSET], hwif->irq); | 1148 | hwif->io_ports[IDE_DATA_OFFSET], hwif->irq); |
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index 462ed3006c30..c11e3b2e67a6 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c | |||
@@ -694,13 +694,8 @@ static int do_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d, | |||
694 | goto out; | 694 | goto out; |
695 | } | 695 | } |
696 | if (noisy) | 696 | if (noisy) |
697 | #ifdef __sparc__ | ||
698 | printk(KERN_INFO "%s: 100%% native mode on irq %s\n", | ||
699 | d->name, __irq_itoa(pciirq)); | ||
700 | #else | ||
701 | printk(KERN_INFO "%s: 100%% native mode on irq %d\n", | 697 | printk(KERN_INFO "%s: 100%% native mode on irq %d\n", |
702 | d->name, pciirq); | 698 | d->name, pciirq); |
703 | #endif | ||
704 | } | 699 | } |
705 | 700 | ||
706 | /* FIXME: silent failure can happen */ | 701 | /* FIXME: silent failure can happen */ |