summaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel/feature.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-12 23:15:27 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-12 23:15:27 +0000
commitae38fd1e4c98588314a42097c5a5e77dcef23561 (patch)
treef9f10c203bb9e5fbad4810d1f8774c08dfad20ff /arch/ppc/kernel/feature.c
parent466a823d79f41d0713b272e48fd73e494b0588e0 (diff)
Merge with Linux 2.3.50.
Diffstat (limited to 'arch/ppc/kernel/feature.c')
-rw-r--r--arch/ppc/kernel/feature.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ppc/kernel/feature.c b/arch/ppc/kernel/feature.c
index 156eb187e..d14c7380a 100644
--- a/arch/ppc/kernel/feature.c
+++ b/arch/ppc/kernel/feature.c
@@ -154,6 +154,9 @@ feature_init(void)
{
struct device_node *np;
+ if (_machine != _MACH_Pmac)
+ return;
+
np = find_devices("mac-io");
while (np != NULL) {
/* KeyLargo contains several (5 ?) FCR registers in mac-io,