diff --git a/[refs] b/[refs]
index bc446178e0f2..ccb9351ea7c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f39d51981e20d4c81d9b2d374ae823f591c6407
+refs/heads/master: c04f7ae2dab9f934a41901b093b6b928f11ccd56
diff --git a/trunk/arch/parisc/Makefile b/trunk/arch/parisc/Makefile
index e574de4efb36..5ddad7bd60ac 100644
--- a/trunk/arch/parisc/Makefile
+++ b/trunk/arch/parisc/Makefile
@@ -16,6 +16,9 @@
 # Modified for PA-RISC Linux by Paul Lahaie, Alex deVries, 
 # Mike Shaver, Helge Deller and Martin K. Petersen
 #
+
+KBUILD_DEFCONFIG := default_defconfig
+
 NM		= sh $(srctree)/arch/parisc/nm
 CHECKFLAGS	+= -D__hppa__=1
 
diff --git a/trunk/arch/parisc/defconfig b/trunk/arch/parisc/configs/default_defconfig
similarity index 100%
rename from trunk/arch/parisc/defconfig
rename to trunk/arch/parisc/configs/default_defconfig