Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

[linux-2.6-block.git] / arch / tile / Makefile

diff --git a/arch/tile/Makefile b/arch/tile/Makefile
index 9520bc5a4b7f65f9904882185267d797885ab7f5..e20b0a0b64a17cf6cf6e796a57b5cecdbad0e871 100644 (file)
--- a/arch/tile/Makefile
+++ b/arch/tile/Makefile
@@ -34,7 +34,12 @@ LIBGCC_PATH     := \
   $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)
 
 # Provide the path to use for "make defconfig".
-KBUILD_DEFCONFIG := $(ARCH)_defconfig
+# We default to the newer TILE-Gx architecture if only "tile" is given.
+ifeq ($(ARCH),tile)
+        KBUILD_DEFCONFIG := tilegx_defconfig
+else
+        KBUILD_DEFCONFIG := $(ARCH)_defconfig
+endif
 
 # Used as a file extension when useful, e.g. head_$(BITS).o
 # Not needed for (e.g.) "$(CC) -m32" since the compiler automatically