Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9877
b: refs/heads/master
c: 1350843
h: refs/heads/master
i:
  9875: 97c5290
v: v3
  • Loading branch information
Benjamin Herrenschmidt authored and Linus Torvalds committed Oct 15, 2005
1 parent 84637a6 commit bdd8ea7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a90933fb4e7b85587e5cbdf863deeb16695c19bd
refs/heads/master: 1350843cf0fa46e2f633c78b335777aac3d054b2
3 changes: 2 additions & 1 deletion trunk/arch/ppc64/kernel/pmac_setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static void __pmac pmac_show_cpuinfo(struct seq_file *m)

/* find motherboard type */
seq_printf(m, "machine\t\t: ");
np = find_devices("device-tree");
np = of_find_node_by_path("/");
if (np != NULL) {
pp = (char *) get_property(np, "model", NULL);
if (pp != NULL)
Expand All @@ -133,6 +133,7 @@ static void __pmac pmac_show_cpuinfo(struct seq_file *m)
}
seq_printf(m, "\n");
}
of_node_put(np);
} else
seq_printf(m, "PowerMac\n");

Expand Down

0 comments on commit bdd8ea7

Please sign in to comment.