diff --git a/[refs] b/[refs]
index 05a06fc1a03a..f5ba4870d7be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b7ac8e479f311f8ef15fbea3f849dded9f3ccd9
+refs/heads/master: 36a248fadf96cd78c6b344442046db5b85cf9a70
diff --git a/trunk/arch/m68knommu/Kconfig b/trunk/arch/m68knommu/Kconfig
index 3cde6822ead1..d3dcdc9609ee 100644
--- a/trunk/arch/m68knommu/Kconfig
+++ b/trunk/arch/m68knommu/Kconfig
@@ -5,7 +5,7 @@
 
 mainmenu "uClinux/68k (w/o MMU) Kernel Configuration"
 
-config M68KNOMMU
+config M68K
 	bool
 	default y