Merge branches 'acpi-processor' and 'acpi-pad'

[deliverable/linux.git] / arch / metag / Makefile

diff --git a/arch/metag/Makefile b/arch/metag/Makefile
index b566116b171b6564756d139eb179d3bcc0186fc2..9739857bdedcb89fe6847d26fdef70041a70228d 100644 (file)
--- a/arch/metag/Makefile
+++ b/arch/metag/Makefile
@@ -20,7 +20,7 @@ checkflags-$(CONFIG_METAG_META12)     += -DMETAC_1_2
 checkflags-$(CONFIG_METAG_META21)      += -DMETAC_2_1
 CHECKFLAGS                             += -D__metag__ $(checkflags-y)
 
-KBUILD_DEFCONFIG                       := meta2_defconfig
+KBUILD_DEFCONFIG                       := tz1090_defconfig
 
 sflags-$(CONFIG_METAG_META12)          += -mmetac=1.2
 ifeq ($(CONFIG_METAG_META12),y)