diff --git a/[refs] b/[refs]
index d113cab044c1..9d52ac1e5228 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6cd6322d594014240465210ccb290971469c6e8
+refs/heads/master: 022f9268854e88adcc343de77a440d6e82f74c2e
diff --git a/trunk/arch/ia64/Makefile b/trunk/arch/ia64/Makefile
index b916ccfdef84..f1645c4f7039 100644
--- a/trunk/arch/ia64/Makefile
+++ b/trunk/arch/ia64/Makefile
@@ -11,6 +11,8 @@
 # Copyright (C) 1998-2004 by David Mosberger-Tang <davidm@hpl.hp.com>
 #
 
+KBUILD_DEFCONFIG := generic_defconfig
+
 NM := $(CROSS_COMPILE)nm -B
 READELF := $(CROSS_COMPILE)readelf
 
diff --git a/trunk/arch/ia64/defconfig b/trunk/arch/ia64/configs/generic_defconfig
similarity index 100%
rename from trunk/arch/ia64/defconfig
rename to trunk/arch/ia64/configs/generic_defconfig