git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
pm-imx27.c
diff --git
a/arch/arm/mach-imx/pm-imx27.c
b/arch/arm/mach-imx/pm-imx27.c
index
acf1769
..
e455d2f
100644
(file)
--- a/
arch/arm/mach-imx/pm-imx27.c
+++ b/
arch/arm/mach-imx/pm-imx27.c
@@
-11,7
+11,7
@@
#include <linux/suspend.h>
#include <linux/io.h>
#include <mach/system.h>
-#include <mach/
mx27
.h>
+#include <mach/
hardware
.h>
static int mx27_suspend_enter(suspend_state_t state)
{