Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge...

[linux-2.6.git] / include / asm-arm / arch-pxa / hardware.h

diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h
index bd600bd..127fc1a 100644 (file)
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
@@ -82,6 +82,11 @@ typedef struct { volatile u32 offset[4096]; } __regbase;
  */
 extern void pxa_gpio_mode( int gpio_mode );
 
+/*
+ * Routine to enable or disable CKEN
+ */
+extern void pxa_set_cken(int clock, int enable);
+
 /*
  * return current memory and LCD clock frequency in units of 10kHz
  */
@@ -90,13 +95,4 @@ extern unsigned int get_lcdclk_frequency_10khz(void);
 
 #endif
 
-
-/*
- * Implementation specifics
- */
-
-#include "lubbock.h"
-#include "mainstone.h"
-#include "idp.h"
-
 #endif  /* _ASM_ARCH_HARDWARE_H */