Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / arch / sparc / kernel / leon_kernel.c

diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
index e34e2c40c0609eac5b41b7220f01304cd2373e20..f8b6eee40bde6596cdd9043e46aa9c9ef908fa4c 100644 (file)
--- a/arch/sparc/kernel/leon_kernel.c
+++ b/arch/sparc/kernel/leon_kernel.c
@@ -486,17 +486,6 @@ void __init leon_trans_init(struct device_node *dp)
        }
 }
 
-void __initdata (*prom_amba_init)(struct device_node *dp, struct device_node ***nextp) = 0;
-
-void __init leon_node_init(struct device_node *dp, struct device_node ***nextp)
-{
-       if (prom_amba_init &&
-           strcmp(dp->type, "ambapp") == 0 &&
-           strcmp(dp->name, "ambapp0") == 0) {
-               prom_amba_init(dp, nextp);
-       }
-}
-
 #ifdef CONFIG_SMP
 void leon_clear_profile_irq(int cpu)
 {
@@ -522,8 +511,3 @@ void __init leon_init_IRQ(void)
        sparc_config.clear_clock_irq  = leon_clear_clock_irq;
        sparc_config.load_profile_irq = leon_load_profile_irq;
 }
-
-void __init leon_init(void)
-{
-       of_pdt_build_more = &leon_node_init;
-}