Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / arch / powerpc / platforms / celleb / setup.c

diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c
index 5f4d0d9332388e1e9455f5a0a7a6c1c49294a7d4..5e9f7f163571a36b08344e18e8e931c8035c47b1 100644 (file)
--- a/arch/powerpc/platforms/celleb/setup.c
+++ b/arch/powerpc/platforms/celleb/setup.c
@@ -67,7 +67,7 @@ static void celleb_show_cpuinfo(struct seq_file *m)
 
        root = of_find_node_by_path("/");
        if (root)
-               model = get_property(root, "model", NULL);
+               model = of_get_property(root, "model", NULL);
        /* using "CHRP" is to trick anaconda into installing FCx into Celleb */
        seq_printf(m, "machine\t\t: %s %s\n", celleb_machine_type, model);
        of_node_put(root);
@@ -80,7 +80,7 @@ static int celleb_machine_type_hack(char *ptr)
        return 0;
 }
 
-__setup("celleb_machine_type_hack", celleb_machine_type_hack);
+__setup("celleb_machine_type_hack=", celleb_machine_type_hack);
 
 static void celleb_progress(char *s, unsigned short hex)
 {
@@ -128,15 +128,6 @@ static int __init celleb_probe(void)
        return 1;
 }
 
-/*
- * Cell has no legacy IO; anything calling this function has to
- * fail or bad things will happen
- */
-static int celleb_check_legacy_ioport(unsigned int baseport)
-{
-       return -ENODEV;
-}
-
 #ifdef CONFIG_KEXEC
 static void celleb_kexec_cpu_down(int crash, int secondary)
 {
@@ -173,7 +164,6 @@ define_machine(celleb) {
        .get_rtc_time           = beat_get_rtc_time,
        .set_rtc_time           = beat_set_rtc_time,
        .calibrate_decr         = generic_calibrate_decr,
-       .check_legacy_ioport    = celleb_check_legacy_ioport,
        .progress               = celleb_progress,
        .power_save             = beat_power_save,
        .nvram_size             = beat_nvram_get_size,