diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/pci/via82cxxx.c | 2 | ||||
-rw-r--r-- | drivers/ide/ppc/pmac.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index c85b87cb59d1..3e677c4f8c28 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c | |||
@@ -440,7 +440,7 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif) | |||
440 | 440 | ||
441 | 441 | ||
442 | #if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32) | 442 | #if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32) |
443 | if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) { | 443 | if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) { |
444 | hwif->irq = hwif->channel ? 15 : 14; | 444 | hwif->irq = hwif->channel ? 15 : 14; |
445 | } | 445 | } |
446 | #endif | 446 | #endif |
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 5013b1285e22..78e30f803671 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1677,7 +1677,7 @@ MODULE_DEVICE_TABLE(pci, pmac_ide_pci_match); | |||
1677 | void __init | 1677 | void __init |
1678 | pmac_ide_probe(void) | 1678 | pmac_ide_probe(void) |
1679 | { | 1679 | { |
1680 | if (_machine != _MACH_Pmac) | 1680 | if (!machine_is(powermac)) |
1681 | return; | 1681 | return; |
1682 | 1682 | ||
1683 | #ifdef CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST | 1683 | #ifdef CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST |