aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-06-22 22:12:03 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-24 02:15:28 -0400
commit690c8fd31f1e35985d0f35772fde514da59ec9d1 (patch)
tree8a5a0036b3780a9eb315ea2201a2562570de1ebe /drivers/input/misc
parentde8d28b16f5614aeb12bb69c8f9a38578b8d3ada (diff)
[SPARC64]: Use in-kernel PROM tree for EBUS and ISA.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/sparcspkr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index f0fd2c4740f1..ed95dc9420dd 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -199,7 +199,7 @@ static int __init sparcspkr_init(void)
199 199
200 for_each_ebus(ebus) { 200 for_each_ebus(ebus) {
201 for_each_ebusdev(edev, ebus) { 201 for_each_ebusdev(edev, ebus) {
202 if (!strcmp(edev->prom_name, "beep")) { 202 if (!strcmp(edev->prom_node->name, "beep")) {
203 beep_name = "Sparc EBUS Speaker"; 203 beep_name = "Sparc EBUS Speaker";
204 beep_event = ebus_spkr_event; 204 beep_event = ebus_spkr_event;
205 beep_iobase = edev->resource[0].start; 205 beep_iobase = edev->resource[0].start;
@@ -213,7 +213,7 @@ static int __init sparcspkr_init(void)
213 /* A hack, the beep device's base lives in 213 /* A hack, the beep device's base lives in
214 * the DMA isa node. 214 * the DMA isa node.
215 */ 215 */
216 if (!strcmp(isa_dev->prom_name, "dma")) { 216 if (!strcmp(isa_dev->prom_node->name, "dma")) {
217 beep_name = "Sparc ISA Speaker"; 217 beep_name = "Sparc ISA Speaker";
218 beep_event = isa_spkr_event, 218 beep_event = isa_spkr_event,
219 beep_iobase = isa_dev->resource.start; 219 beep_iobase = isa_dev->resource.start;