From 6297f2c861bad4542295871cd910c0945f37e8b4 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 25 May 2012 21:20:13 +0000
Subject: [PATCH] --- yaml --- r: 309530 b: refs/heads/master c:
 5561cd269820252dccf08b1cc093afbc2f06242d h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/sparc/include/asm/leon.h      | 2 --
 trunk/arch/sparc/include/asm/leon_amba.h | 4 ----
 trunk/arch/sparc/kernel/Makefile         | 2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e1c7ba8e1473..e00e6f29badb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93bb32f632c90be00d9e5d69091ada201f619c18
+refs/heads/master: 5561cd269820252dccf08b1cc093afbc2f06242d
diff --git a/trunk/arch/sparc/include/asm/leon.h b/trunk/arch/sparc/include/asm/leon.h
index 00530a599c1f..95fa93187dde 100644
--- a/trunk/arch/sparc/include/asm/leon.h
+++ b/trunk/arch/sparc/include/asm/leon.h
@@ -257,9 +257,7 @@ extern int leon_ipi_irq;
 #ifndef CONFIG_SPARC_LEON
 
 /* nop definitions for !LEON case */
-#define leon_init() do {} while (0)
 #define leon_switch_mm() do {} while (0)
-#define leon_init_IRQ() do {} while (0)
 #define init_leon() do {} while (0)
 #define leon_smp_done() do {} while (0)
 #define leon_boot_cpus() do {} while (0)
diff --git a/trunk/arch/sparc/include/asm/leon_amba.h b/trunk/arch/sparc/include/asm/leon_amba.h
index e50f326e71bd..f3034eddf468 100644
--- a/trunk/arch/sparc/include/asm/leon_amba.h
+++ b/trunk/arch/sparc/include/asm/leon_amba.h
@@ -87,8 +87,6 @@ struct amba_prom_registers {
 #define LEON3_GPTIMER_CONFIG_NRTIMERS(c) ((c)->config & 0x7)
 #define LEON3_GPTIMER_CTRL_ISPENDING(r)  (((r)&LEON3_GPTIMER_CTRL_PENDING) ? 1 : 0)
 
-#ifdef CONFIG_SPARC_LEON
-
 #ifndef __ASSEMBLY__
 
 struct leon3_irqctrl_regs_map {
@@ -264,6 +262,4 @@ extern unsigned int sparc_leon_eirq;
 
 #define amba_device(x) (((x) >> 12) & 0xfff)
 
-#endif /* !defined(CONFIG_SPARC_LEON) */
-
 #endif
diff --git a/trunk/arch/sparc/kernel/Makefile b/trunk/arch/sparc/kernel/Makefile
index 72308f9b0096..43af0d619a3a 100644
--- a/trunk/arch/sparc/kernel/Makefile
+++ b/trunk/arch/sparc/kernel/Makefile
@@ -51,7 +51,7 @@ obj-y                   += of_device_common.o
 obj-y                   += of_device_$(BITS).o
 obj-$(CONFIG_SPARC64)   += prom_irqtrans.o
 
-obj-$(CONFIG_SPARC_LEON)+= leon_kernel.o
+obj-$(CONFIG_SPARC32)   += leon_kernel.o
 obj-$(CONFIG_SPARC_LEON)+= leon_pmc.o
 
 obj-$(CONFIG_SPARC64)   += reboot.o