Merge branch 'master' of /home/cbou/linux-2.6

[pandora-kernel.git] / arch / arm / mach-pxa / generic.c

diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 4461793..ca05322 100644 (file)
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -59,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.
  *