diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-06-22 22:12:03 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-24 02:15:28 -0400 |
commit | 690c8fd31f1e35985d0f35772fde514da59ec9d1 (patch) | |
tree | 8a5a0036b3780a9eb315ea2201a2562570de1ebe /sound | |
parent | de8d28b16f5614aeb12bb69c8f9a38578b8d3ada (diff) |
[SPARC64]: Use in-kernel PROM tree for EBUS and ISA.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/sparc/cs4231.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index b3efc9aa2916..da54d04a3e3a 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
@@ -2284,15 +2284,14 @@ static int __init cs4231_init(void) | |||
2284 | for_each_ebusdev(edev, ebus) { | 2284 | for_each_ebusdev(edev, ebus) { |
2285 | int match = 0; | 2285 | int match = 0; |
2286 | 2286 | ||
2287 | if (!strcmp(edev->prom_name, "SUNW,CS4231")) { | 2287 | if (!strcmp(edev->prom_node->name, "SUNW,CS4231")) { |
2288 | match = 1; | 2288 | match = 1; |
2289 | } else if (!strcmp(edev->prom_name, "audio")) { | 2289 | } else if (!strcmp(edev->prom_node->name, "audio")) { |
2290 | char compat[16]; | 2290 | char *compat; |
2291 | 2291 | ||
2292 | prom_getstring(edev->prom_node, "compatible", | 2292 | compat = of_get_property(edev->prom_node, |
2293 | compat, sizeof(compat)); | 2293 | "compatible", NULL); |
2294 | compat[15] = '\0'; | 2294 | if (compat && !strcmp(compat, "SUNW,CS4231")) |
2295 | if (!strcmp(compat, "SUNW,CS4231")) | ||
2296 | match = 1; | 2295 | match = 1; |
2297 | } | 2296 | } |
2298 | 2297 | ||