diff --git a/[refs] b/[refs]
index d643b4bd7897..2aa431d9edf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfbaec06bd80117f8ed944236efab8fb32cd4f68
+refs/heads/master: 6220443db41899606a8621215e0f6e99477f7152
diff --git a/trunk/arch/c6x/Kconfig b/trunk/arch/c6x/Kconfig
index 1c3ccd416d50..30c04c658b9e 100644
--- a/trunk/arch/c6x/Kconfig
+++ b/trunk/arch/c6x/Kconfig
@@ -15,6 +15,7 @@ config TMS320C6X
 	select IRQ_DOMAIN
 	select OF
 	select OF_EARLY_FLATTREE
+	select GENERIC_CLOCKEVENTS
 
 config MMU
 	def_bool n
@@ -43,12 +44,6 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_HWEIGHT
 	def_bool y
 
-config GENERIC_CLOCKEVENTS
-	def_bool y
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-	bool
-
 config GENERIC_BUG
 	def_bool y