summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-07 19:06:52 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-07 19:06:52 +0100
commit5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (patch)
treefc0516369f4146595c5dce9bddda23d8691c3f42 /arch/arm/mach-pxa/Makefile
parent35437b6192d9a4eb92f095dfd72396b6d2970f0b (diff)
parent92b797f6a1347623a41caf02516b70e5fa706a90 (diff)
downloadblackbird-op-linux-5ff7f78a3db462ea4edf1a781a2002d4e8a8a473.tar.gz
blackbird-op-linux-5ff7f78a3db462ea4edf1a781a2002d4e8a8a473.zip
Merge branch 'pxa-trizeps' into pxa-machines
Conflicts: drivers/pcmcia/Makefile
Diffstat (limited to 'arch/arm/mach-pxa/Makefile')
-rw-r--r--arch/arm/mach-pxa/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 3b9454616d95..0d213ec58b1c 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -64,7 +64,6 @@ led-y := leds.o
led-$(CONFIG_ARCH_LUBBOCK) += leds-lubbock.o
led-$(CONFIG_MACH_MAINSTONE) += leds-mainstone.o
led-$(CONFIG_ARCH_PXA_IDP) += leds-idp.o
-led-$(CONFIG_MACH_TRIZEPS4) += leds-trizeps4.o
obj-$(CONFIG_LEDS) += $(led-y)
OpenPOWER on IntegriCloud