Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux-2.6-microblaze.git] / arch / openrisc / kernel / setup.c

diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
index 8ae2da6..0cd04d9 100644 (file)
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
@@ -209,7 +209,8 @@ void __init setup_cpuinfo(void)
 }
 
 /**
- * or32_early_setup
+ * or1k_early_setup
+ * @fdt: pointer to the start of the device tree in memory or NULL
  *
  * Handles the pointer to the device tree that this kernel is to use
  * for establishing the available platform devices.
@@ -217,7 +218,7 @@ void __init setup_cpuinfo(void)
  * Falls back on built-in device tree in case null pointer is passed.
  */
 
-void __init or32_early_setup(void *fdt)
+void __init or1k_early_setup(void *fdt)
 {
        if (fdt)
                pr_info("FDT at %p\n", fdt);
@@ -243,21 +244,6 @@ static inline unsigned long extract_value(unsigned long reg, unsigned long mask)
        return mask & reg;
 }
 
-void __init detect_unit_config(unsigned long upr, unsigned long mask,
-                              char *text, void (*func) (void))
-{
-       if (text != NULL)
-               printk("%s", text);
-
-       if (upr & mask) {
-               if (func != NULL)
-                       func();
-               else
-                       printk("present\n");
-       } else
-               printk("not present\n");
-}
-
 /*
  * calibrate_delay
  *