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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-cns3xxx
/
pm.c
diff --git
a/arch/arm/mach-cns3xxx/pm.c
b/arch/arm/mach-cns3xxx/pm.c
index
5e57955
..
0c04678
100644
(file)
--- a/
arch/arm/mach-cns3xxx/pm.c
+++ b/
arch/arm/mach-cns3xxx/pm.c
@@
-10,7
+10,7
@@
#include <linux/module.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <mach/system.h>
#include <mach/cns3xxx.h>
#include <mach/pm.h>