leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-arm

Browse Source
This commit is contained in:
Linus Torvalds 2005-06-13 14:47:47 -07:00
commit 386bfcf5e8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-pxa/pxa25x.c
View File

@ -16,6 +16,7 @@
* initialization stuff for PXA machines which can be overridden later if * initialization stuff for PXA machines which can be overridden later if
* need be. * need be.
*/ */
#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
@ -103,6 +104,7 @@ unsigned int get_lcdclk_frequency_10khz(void)
EXPORT_SYMBOL(get_lcdclk_frequency_10khz); EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
#ifdef CONFIG_PM
int pxa_cpu_pm_prepare(suspend_state_t state) int pxa_cpu_pm_prepare(suspend_state_t state)
{ {
@ -131,3 +133,5 @@ void pxa_cpu_pm_enter(suspend_state_t state)
break; break;
} }
} }
#endif

4
arch/arm/mach-pxa/pxa27x.c
View File

@ -120,6 +120,8 @@ EXPORT_SYMBOL(get_clk_frequency_khz);
EXPORT_SYMBOL(get_memclk_frequency_10khz); EXPORT_SYMBOL(get_memclk_frequency_10khz);
EXPORT_SYMBOL(get_lcdclk_frequency_10khz); EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
#ifdef CONFIG_PM
int pxa_cpu_pm_prepare(suspend_state_t state) int pxa_cpu_pm_prepare(suspend_state_t state)
{ {
switch (state) { switch (state) {
@ -153,6 +155,8 @@ void pxa_cpu_pm_enter(suspend_state_t state)
} }
} }
#endif
/* /*
* device registration specific to PXA27x. * device registration specific to PXA27x.
*/ */