diff options
| author |   Sam Ravnborg <sam@ravnborg.org> | 2012-05-25 21:20:13 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-05-27 23:52:46 -0700 |
| commit | 5561cd269820252dccf08b1cc093afbc2f06242d (patch) | |
| tree | 09b05a412acc787f6b400786b835f940227b4105 | |
| parent | sparc32,leon: clean up leon.h (diff) | |
| download | linux-dev-5561cd269820252dccf08b1cc093afbc2f06242d.tar.xz linux-dev-5561cd269820252dccf08b1cc093afbc2f06242d.zip | |
sparc32,leon: always include leon_kernel in build
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Konrad Eisele <konrad@gaisler.com>
| -rw-r--r-- | arch/sparc/include/asm/leon.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/leon_amba.h | 4 | ||||
| -rw-r--r-- | arch/sparc/kernel/Makefile | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h index 00530a599c1f..95fa93187dde 100644 --- a/arch/sparc/include/asm/leon.h +++ b/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/arch/sparc/include/asm/leon_amba.h b/arch/sparc/include/asm/leon_amba.h index e50f326e71bd..f3034eddf468 100644 --- a/arch/sparc/include/asm/leon_amba.h +++ b/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/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile index 72308f9b0096..43af0d619a3a 100644 --- a/arch/sparc/kernel/Makefile +++ b/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 |