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 /drivers/input/serio/i8042-sparcio.h | |
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 'drivers/input/serio/i8042-sparcio.h')
-rw-r--r-- | drivers/input/serio/i8042-sparcio.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h index ed9446f6d7e3..6d66351805a2 100644 --- a/drivers/input/serio/i8042-sparcio.h +++ b/drivers/input/serio/i8042-sparcio.h | |||
@@ -74,7 +74,7 @@ static int __init i8042_platform_init(void) | |||
74 | 74 | ||
75 | for_each_ebus(ebus) { | 75 | for_each_ebus(ebus) { |
76 | for_each_ebusdev(edev, ebus) { | 76 | for_each_ebusdev(edev, ebus) { |
77 | if (!strcmp(edev->prom_name, "8042")) | 77 | if (!strcmp(edev->prom_node->name, "8042")) |
78 | goto edev_found; | 78 | goto edev_found; |
79 | } | 79 | } |
80 | } | 80 | } |
@@ -82,14 +82,14 @@ static int __init i8042_platform_init(void) | |||
82 | 82 | ||
83 | edev_found: | 83 | edev_found: |
84 | for_each_edevchild(edev, child) { | 84 | for_each_edevchild(edev, child) { |
85 | if (!strcmp(child->prom_name, OBP_PS2KBD_NAME1) || | 85 | if (!strcmp(child->prom_node->name, OBP_PS2KBD_NAME1) || |
86 | !strcmp(child->prom_name, OBP_PS2KBD_NAME2)) { | 86 | !strcmp(child->prom_node->name, OBP_PS2KBD_NAME2)) { |
87 | i8042_kbd_irq = child->irqs[0]; | 87 | i8042_kbd_irq = child->irqs[0]; |
88 | kbd_iobase = | 88 | kbd_iobase = |
89 | ioremap(child->resource[0].start, 8); | 89 | ioremap(child->resource[0].start, 8); |
90 | } | 90 | } |
91 | if (!strcmp(child->prom_name, OBP_PS2MS_NAME1) || | 91 | if (!strcmp(child->prom_node->name, OBP_PS2MS_NAME1) || |
92 | !strcmp(child->prom_name, OBP_PS2MS_NAME2)) | 92 | !strcmp(child->prom_node->name, OBP_PS2MS_NAME2)) |
93 | i8042_aux_irq = child->irqs[0]; | 93 | i8042_aux_irq = child->irqs[0]; |
94 | } | 94 | } |
95 | if (i8042_kbd_irq == -1 || | 95 | if (i8042_kbd_irq == -1 || |