Merge master.kernel.org:/home/rmk/linux-2.6-arm (386bfcf5) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-pxa/pxa25x.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		* initialization stuff for PXA machines which can be overridden later if
		* need be.
		*/
		#include <linux/config.h>
		#include <linux/module.h>
		#include <linux/kernel.h>
		#include <linux/init.h>
		@@ -103,6 +104,7 @@ unsigned int get_lcdclk_frequency_10khz(void)

		EXPORT_SYMBOL(get_lcdclk_frequency_10khz);

		#ifdef CONFIG_PM

		int pxa_cpu_pm_prepare(suspend_state_t state)
		{
		@@ -131,3 +133,5 @@ void pxa_cpu_pm_enter(suspend_state_t state)
		break;
		}
		}

		#endif

+4 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,8 @@ EXPORT_SYMBOL(get_clk_frequency_khz);
		EXPORT_SYMBOL(get_memclk_frequency_10khz);
		EXPORT_SYMBOL(get_lcdclk_frequency_10khz);

		#ifdef CONFIG_PM

		int pxa_cpu_pm_prepare(suspend_state_t state)
		{
		switch (state) {
		@@ -153,6 +155,8 @@ void pxa_cpu_pm_enter(suspend_state_t state)
		}
		}

		#endif

		/*
		* device registration specific to PXA27x.
		*/