Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8fa3f0c authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

[PATCH] ARM: 2711/1: fix compilation on PXA targets with CONFIG_PM=n 



Patch from Nicolas Pitre

Signed-off-by: Nicolas Pitre
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c0105338

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

arch/arm/mach-pxa/pxa27x.c

+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.

 */