Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6-omap-h63xx.git] / arch / xtensa / Makefile

diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 56685a88334747ef1467cac388345f5b9bf20339..015b6b2a26b96676eadbae477d68ea4e82ebf340 100644 (file)
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -14,6 +14,7 @@
 # (Use VAR=<xtensa_config> to use another default compiler.)
 
 variant-$(CONFIG_XTENSA_VARIANT_FSF)           := fsf
+variant-$(CONFIG_XTENSA_VARIANT_DC232B)                := dc232b
 variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM)  := custom
 
 VARIANT = $(variant-y)
@@ -59,7 +60,7 @@ LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 head-y         := arch/xtensa/kernel/head.o
 core-y         += arch/xtensa/kernel/ arch/xtensa/mm/
 ifneq ($(PLATFORM),)
-core-y         += arch/xtensa/platform-$(PLATFORM)/
+core-y         += arch/xtensa/platforms/$(PLATFORM)/
 endif
 libs-y         += arch/xtensa/lib/ $(LIBGCC)