diff options
-rw-r--r-- | arch/arm/mach-pxa/generic.c | 4 | ||||
-rw-r--r-- | include/asm-arm/arch-pxa/hardware.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 2f0cc1c4995a..1c5413fc6e74 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
@@ -123,7 +123,7 @@ EXPORT_SYMBOL(pxa_gpio_set_value); | |||
123 | /* | 123 | /* |
124 | * Routine to safely enable or disable a clock in the CKEN | 124 | * Routine to safely enable or disable a clock in the CKEN |
125 | */ | 125 | */ |
126 | void pxa_set_cken(int clock, int enable) | 126 | void __pxa_set_cken(int clock, int enable) |
127 | { | 127 | { |
128 | unsigned long flags; | 128 | unsigned long flags; |
129 | local_irq_save(flags); | 129 | local_irq_save(flags); |
@@ -136,7 +136,7 @@ void pxa_set_cken(int clock, int enable) | |||
136 | local_irq_restore(flags); | 136 | local_irq_restore(flags); |
137 | } | 137 | } |
138 | 138 | ||
139 | EXPORT_SYMBOL(pxa_set_cken); | 139 | EXPORT_SYMBOL(__pxa_set_cken); |
140 | 140 | ||
141 | /* | 141 | /* |
142 | * Intel PXA2xx internal register mapping. | 142 | * Intel PXA2xx internal register mapping. |
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h index 68e7b430ac80..538a34e39e92 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h | |||
@@ -116,7 +116,11 @@ extern void pxa_gpio_set_value(unsigned gpio, int value); | |||
116 | /* | 116 | /* |
117 | * Routine to enable or disable CKEN | 117 | * Routine to enable or disable CKEN |
118 | */ | 118 | */ |
119 | extern void pxa_set_cken(int clock, int enable); | 119 | static inline void __deprecated pxa_set_cken(int clock, int enable) |
120 | { | ||
121 | extern void __pxa_set_cken(int clock, int enable); | ||
122 | __pxa_set_cken(clock, enable); | ||
123 | } | ||
120 | 124 | ||
121 | /* | 125 | /* |
122 | * return current memory and LCD clock frequency in units of 10kHz | 126 | * return current memory and LCD clock frequency in units of 10kHz |