aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/pci_sabre.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-06-22 02:34:02 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-24 02:15:17 -0400
commit07f8e5f358a0b7240f1dad6b3819f2fd1103f159 (patch)
tree5976cc05de92f27a9cc12a3db31ced5311ac3769 /arch/sparc64/kernel/pci_sabre.c
parent6d307724cb6a6b8466cad4fdf13d8a409bc2433f (diff)
[SPARC64]: Convert cpu_find_by_*() interface to in-kernel PROM device tree.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/pci_sabre.c')
-rw-r--r--arch/sparc64/kernel/pci_sabre.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index 91d1aa44efc1..4ce7b4620c09 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -1455,16 +1455,13 @@ void sabre_init(struct device_node *dp, char *model_name)
1455 hummingbird_p = 1; 1455 hummingbird_p = 1;
1456 } 1456 }
1457 if (!hummingbird_p) { 1457 if (!hummingbird_p) {
1458 char compat[64]; 1458 struct device_node *dp;
1459 int cpu_node;
1460 1459
1461 /* Of course, Sun has to encode things a thousand 1460 /* Of course, Sun has to encode things a thousand
1462 * different ways, inconsistently. 1461 * different ways, inconsistently.
1463 */ 1462 */
1464 cpu_find_by_instance(0, &cpu_node, NULL); 1463 cpu_find_by_instance(0, &dp, NULL);
1465 if (prom_getproperty(cpu_node, "name", 1464 if (!strcmp(dp->name, "SUNW,UltraSPARC-IIe"))
1466 compat, sizeof(compat)) > 0 &&
1467 !strcmp(compat, "SUNW,UltraSPARC-IIe"))
1468 hummingbird_p = 1; 1465 hummingbird_p = 1;
1469 } 1466 }
1470 } 1467 }