Pull trivial2 into release branch

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / pci_32.c

diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 704c846b2b0f5272a135dba226622df9c5253e3b..b129d2e4b7598af004ad6b52d1cd82dc9f3b4a21 100644 (file)
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -787,7 +787,7 @@ pci_busdev_to_OF_node(struct pci_bus *bus, int devfn)
         * fix has to be done by making the remapping per-host and always
         * filling the pci_to_OF map. --BenH
         */
-       if (_machine == _MACH_Pmac && busnr >= 0xf0)
+       if (machine_is(powermac) && busnr >= 0xf0)
                busnr -= 0xf0;
        else
 #endif
@@ -1728,7 +1728,7 @@ long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn)
         * (bus 0 is HT root), we return the AGP one instead.
         */
 #ifdef CONFIG_PPC_PMAC
-       if (_machine == _MACH_Pmac && machine_is_compatible("MacRISC4"))
+       if (machine_is(powermac) && machine_is_compatible("MacRISC4"))
                if (bus == 0)
                        bus = 0xf0;
 #endif /* CONFIG_PPC_PMAC */