diff --git a/[refs] b/[refs]
index a3465f821d3e..912ceeeabd01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdc614e873bc56ed15d8f4e9fa33516cd0915fc2
+refs/heads/master: 66a7f72d9892013e9ea663260f407758989ff510
diff --git a/trunk/arch/arm/mach-pxa/generic.c b/trunk/arch/arm/mach-pxa/generic.c
index c2f102339f57..ca053226fba0 100644
--- a/trunk/arch/arm/mach-pxa/generic.c
+++ b/trunk/arch/arm/mach-pxa/generic.c
@@ -26,7 +26,6 @@
 #include <asm/mach/map.h>
 
 #include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h> /* for __pxa_set_cken */
 
 #include "generic.h"
 
@@ -60,23 +59,6 @@ unsigned int get_memclk_frequency_10khz(void)
 }
 EXPORT_SYMBOL(get_memclk_frequency_10khz);
 
-/*
- * Routine to safely enable or disable a clock in the CKEN
- */
-void __pxa_set_cken(int clock, int enable)
-{
-	unsigned long flags;
-	local_irq_save(flags);
-
-	if (enable)
-		CKEN |= (1 << clock);
-	else
-		CKEN &= ~(1 << clock);
-
-	local_irq_restore(flags);
-}
-EXPORT_SYMBOL(__pxa_set_cken);
-
 /*
  * Intel PXA2xx internal register mapping.
  *
diff --git a/trunk/include/asm-arm/arch-pxa/hardware.h b/trunk/include/asm-arm/arch-pxa/hardware.h
index e25558faa5a4..d9af6dabc899 100644
--- a/trunk/include/asm-arm/arch-pxa/hardware.h
+++ b/trunk/include/asm-arm/arch-pxa/hardware.h
@@ -191,15 +191,6 @@ extern int pxa_gpio_get_value(unsigned gpio);
  */
 extern void pxa_gpio_set_value(unsigned gpio, int value);
 
-/*
- * Routine to enable or disable CKEN
- */
-static inline void __deprecated pxa_set_cken(int clock, int enable)
-{
-	extern void __pxa_set_cken(int clock, int enable);
-	__pxa_set_cken(clock, enable);
-}
-
 /*
  * return current memory and LCD clock frequency in units of 10kHz
  */