diff options
Diffstat (limited to 'arch/powerpc/platforms/cell/setup.c')
-rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index 36989c2eee66..54b96183cb64 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c | |||
@@ -71,7 +71,7 @@ static void cell_show_cpuinfo(struct seq_file *m) | |||
71 | 71 | ||
72 | root = of_find_node_by_path("/"); | 72 | root = of_find_node_by_path("/"); |
73 | if (root) | 73 | if (root) |
74 | model = get_property(root, "model", NULL); | 74 | model = of_get_property(root, "model", NULL); |
75 | seq_printf(m, "machine\t\t: CHRP %s\n", model); | 75 | seq_printf(m, "machine\t\t: CHRP %s\n", model); |
76 | of_node_put(root); | 76 | of_node_put(root); |
77 | } | 77 | } |
@@ -190,15 +190,6 @@ static int __init cell_probe(void) | |||
190 | return 1; | 190 | return 1; |
191 | } | 191 | } |
192 | 192 | ||
193 | /* | ||
194 | * Cell has no legacy IO; anything calling this function has to | ||
195 | * fail or bad things will happen | ||
196 | */ | ||
197 | static int cell_check_legacy_ioport(unsigned int baseport) | ||
198 | { | ||
199 | return -ENODEV; | ||
200 | } | ||
201 | |||
202 | define_machine(cell) { | 193 | define_machine(cell) { |
203 | .name = "Cell", | 194 | .name = "Cell", |
204 | .probe = cell_probe, | 195 | .probe = cell_probe, |
@@ -211,7 +202,6 @@ define_machine(cell) { | |||
211 | .get_rtc_time = rtas_get_rtc_time, | 202 | .get_rtc_time = rtas_get_rtc_time, |
212 | .set_rtc_time = rtas_set_rtc_time, | 203 | .set_rtc_time = rtas_set_rtc_time, |
213 | .calibrate_decr = generic_calibrate_decr, | 204 | .calibrate_decr = generic_calibrate_decr, |
214 | .check_legacy_ioport = cell_check_legacy_ioport, | ||
215 | .progress = cell_progress, | 205 | .progress = cell_progress, |
216 | .init_IRQ = cell_init_irq, | 206 | .init_IRQ = cell_init_irq, |
217 | .pci_setup_phb = rtas_setup_phb, | 207 | .pci_setup_phb = rtas_setup_phb, |