git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
powerpc
/
kernel
/
pci_32.c
diff --git
a/arch/powerpc/kernel/pci_32.c
b/arch/powerpc/kernel/pci_32.c
index
b129d2e
..
704c846
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
*/
* fix has to be done by making the remapping per-host and always
* filling the pci_to_OF map. --BenH
*/
- if (
machine_is(powermac)
&& busnr >= 0xf0)
+ if (
_machine == _MACH_Pmac
&& busnr >= 0xf0)
busnr -= 0xf0;
else
#endif
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
* (bus 0 is HT root), we return the AGP one instead.
*/
#ifdef CONFIG_PPC_PMAC
- if (
machine_is(powermac)
&& machine_is_compatible("MacRISC4"))
+ if (
_machine == _MACH_Pmac
&& machine_is_compatible("MacRISC4"))
if (bus == 0)
bus = 0xf0;
#endif /* CONFIG_PPC_PMAC */
if (bus == 0)
bus = 0xf0;
#endif /* CONFIG_PPC_PMAC */