From bdd8ea7d3efaa9022acbfa131fd2437e0222f3ef Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Fri, 14 Oct 2005 15:59:09 -0700 Subject: [PATCH] --- yaml --- r: 9877 b: refs/heads/master c: 1350843cf0fa46e2f633c78b335777aac3d054b2 h: refs/heads/master i: 9875: 97c5290644bd9af79ec250b02aa96249bc44fb8d v: v3 --- [refs] | 2 +- trunk/arch/ppc64/kernel/pmac_setup.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 97b1908bebd7..dcd442c43206 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a90933fb4e7b85587e5cbdf863deeb16695c19bd +refs/heads/master: 1350843cf0fa46e2f633c78b335777aac3d054b2 diff --git a/trunk/arch/ppc64/kernel/pmac_setup.c b/trunk/arch/ppc64/kernel/pmac_setup.c index 25755252067a..fa8121d53b89 100644 --- a/trunk/arch/ppc64/kernel/pmac_setup.c +++ b/trunk/arch/ppc64/kernel/pmac_setup.c @@ -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) @@ -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");