summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/grackle.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-02-02 05:34:14 +0100
committerGrant Likely <grant.likely@secretlab.ca>2010-02-09 16:33:00 +0100
commit71a157e8edca55198e808f8561dd49017a54ee34 (patch)
treea78185ea8204f1e375d88545235ba3d4937ebfaf /arch/powerpc/sysdev/grackle.c
parentof: merge of_find_node_by_phandle (diff)
downloadlinux-71a157e8edca55198e808f8561dd49017a54ee34.tar.xz
linux-71a157e8edca55198e808f8561dd49017a54ee34.zip
of: add 'of_' prefix to machine_is_compatible()
machine is compatible is an OF-specific call. It should have the of_ prefix to protect the global namespace. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/powerpc/sysdev/grackle.c')
-rw-r--r--arch/powerpc/sysdev/grackle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/grackle.c b/arch/powerpc/sysdev/grackle.c
index 5da37c2f22ee..cf27df6e508b 100644
--- a/arch/powerpc/sysdev/grackle.c
+++ b/arch/powerpc/sysdev/grackle.c
@@ -56,9 +56,9 @@ static inline void grackle_set_loop_snoop(struct pci_controller *bp, int enable)
void __init setup_grackle(struct pci_controller *hose)
{
setup_indirect_pci(hose, 0xfec00000, 0xfee00000, 0);
- if (machine_is_compatible("PowerMac1,1"))
+ if (of_machine_is_compatible("PowerMac1,1"))
ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS);
- if (machine_is_compatible("AAPL,PowerBook1998"))
+ if (of_machine_is_compatible("AAPL,PowerBook1998"))
grackle_set_loop_snoop(hose, 1);
#if 0 /* Disabled for now, HW problems ??? */
grackle_set_stg(hose, 1);