projects
/
linux-flexiantxendom0-3.2.10.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm...
[linux-flexiantxendom0-3.2.10.git]
/
arch
/
arm
/
plat-mxc
/
system.c
diff --git
a/arch/arm/plat-mxc/system.c
b/arch/arm/plat-mxc/system.c
index
f30dcac
..
1996c3e
100644
(file)
--- a/
arch/arm/plat-mxc/system.c
+++ b/
arch/arm/plat-mxc/system.c
@@
-25,8
+25,8
@@
#include <mach/hardware.h>
#include <mach/common.h>
+#include <asm/system_misc.h>
#include <asm/proc-fns.h>
-#include <asm/system.h>
#include <asm/mach-types.h>
void __iomem *(*imx_ioremap)(unsigned long, size_t, unsigned int) = NULL;