projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.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
020e6de
..
237e8aa
100644
(file)
--- a/
arch/arm/mach-imx/pm-imx27.c
+++ b/
arch/arm/mach-imx/pm-imx27.c
@@
-12,6
+12,7
@@
#include <linux/suspend.h>
#include <linux/io.h>
+#include "common.h"
#include "hardware.h"
static int mx27_suspend_enter(suspend_state_t state)