diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 23:09:41 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 23:09:41 +0100 |
commit | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (patch) | |
tree | 4aa71d7551184ee88f32c7f3660d821133058c32 /arch/arm/kernel/Makefile | |
parent | Merge branch 'perf' into devel (diff) | |
parent | ARM: Eliminate decompressor -Dstatic= PIC hack (diff) | |
download | linux-2741ecb4ce5c2d430b5c44b0a169038338c21df5.tar.xz linux-2741ecb4ce5c2d430b5c44b0a169038338c21df5.zip |
Merge branch 'misc2' into devel
Diffstat (limited to 'arch/arm/kernel/Makefile')
-rw-r--r-- | arch/arm/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index c76e6d2679b8..26d302c28e13 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -17,6 +17,7 @@ obj-y := compat.o elf.o entry-armv.o entry-common.o irq.o \ process.o ptrace.o return_address.o setup.o signal.o \ sys_arm.o stacktrace.o time.o traps.o +obj-$(CONFIG_LEDS) += leds.o obj-$(CONFIG_OC_ETM) += etm.o obj-$(CONFIG_ISA_DMA_API) += dma.o |