projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for_paulus
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
common
/
sharpsl_pm.c
diff --git
a/arch/arm/common/sharpsl_pm.c
b/arch/arm/common/sharpsl_pm.c
index b3599743093ba8f5ece1bc6a3753ee4eb70ee852..a3b450f8ef17b94a32c83b9c92acbf2861019386 100644
(file)
--- a/
arch/arm/common/sharpsl_pm.c
+++ b/
arch/arm/common/sharpsl_pm.c
@@
-27,7
+27,7
@@
#include <asm/hardware.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
-#include <asm/apm.h>
+#include <asm/apm
-emulation
.h>
#include <asm/arch/pm.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/sharpsl.h>