diff options
| -rw-r--r-- | arch/sparc/include/asm/leon.h | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/leon_kernel.c | 16 | ||||
| -rw-r--r-- | arch/sparc/mm/init_32.c | 2 |
3 files changed, 0 insertions, 19 deletions
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h index 3375c6293893..15a716934e4d 100644 --- a/arch/sparc/include/asm/leon.h +++ b/arch/sparc/include/asm/leon.h | |||
| @@ -82,7 +82,6 @@ static inline unsigned long leon_load_reg(unsigned long paddr) | |||
| 82 | #define LEON_BYPASS_LOAD_PA(x) leon_load_reg((unsigned long)(x)) | 82 | #define LEON_BYPASS_LOAD_PA(x) leon_load_reg((unsigned long)(x)) |
| 83 | #define LEON_BYPASS_STORE_PA(x, v) leon_store_reg((unsigned long)(x), (unsigned long)(v)) | 83 | #define LEON_BYPASS_STORE_PA(x, v) leon_store_reg((unsigned long)(x), (unsigned long)(v)) |
| 84 | 84 | ||
| 85 | extern void leon_init(void); | ||
| 86 | extern void leon_switch_mm(void); | 85 | extern void leon_switch_mm(void); |
| 87 | extern void leon_init_IRQ(void); | 86 | extern void leon_init_IRQ(void); |
| 88 | 87 | ||
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c index e34e2c40c060..f8b6eee40bde 100644 --- 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) | |||
| 486 | } | 486 | } |
| 487 | } | 487 | } |
| 488 | 488 | ||
| 489 | void __initdata (*prom_amba_init)(struct device_node *dp, struct device_node ***nextp) = 0; | ||
| 490 | |||
| 491 | void __init leon_node_init(struct device_node *dp, struct device_node ***nextp) | ||
| 492 | { | ||
| 493 | if (prom_amba_init && | ||
| 494 | strcmp(dp->type, "ambapp") == 0 && | ||
| 495 | strcmp(dp->name, "ambapp0") == 0) { | ||
| 496 | prom_amba_init(dp, nextp); | ||
| 497 | } | ||
| 498 | } | ||
| 499 | |||
| 500 | #ifdef CONFIG_SMP | 489 | #ifdef CONFIG_SMP |
| 501 | void leon_clear_profile_irq(int cpu) | 490 | void leon_clear_profile_irq(int cpu) |
| 502 | { | 491 | { |
| @@ -522,8 +511,3 @@ void __init leon_init_IRQ(void) | |||
| 522 | sparc_config.clear_clock_irq = leon_clear_clock_irq; | 511 | sparc_config.clear_clock_irq = leon_clear_clock_irq; |
| 523 | sparc_config.load_profile_irq = leon_load_profile_irq; | 512 | sparc_config.load_profile_irq = leon_load_profile_irq; |
| 524 | } | 513 | } |
| 525 | |||
| 526 | void __init leon_init(void) | ||
| 527 | { | ||
| 528 | of_pdt_build_more = &leon_node_init; | ||
| 529 | } | ||
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index ef5c779ec855..e8ea360a4d9b 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c | |||
| @@ -294,8 +294,6 @@ void __init paging_init(void) | |||
| 294 | { | 294 | { |
| 295 | switch(sparc_cpu_model) { | 295 | switch(sparc_cpu_model) { |
| 296 | case sparc_leon: | 296 | case sparc_leon: |
| 297 | leon_init(); | ||
| 298 | /* fall through */ | ||
| 299 | case sun4m: | 297 | case sun4m: |
| 300 | case sun4d: | 298 | case sun4d: |
| 301 | srmmu_paging_init(); | 299 | srmmu_paging_init(); |
