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 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
include
/
mach
/
msm_iomap.h
diff --git
a/arch/arm/mach-msm/include/mach/msm_iomap.h
b/arch/arm/mach-msm/include/mach/msm_iomap.h
index
e6b1821
..
8e24dd8
100644
(file)
--- a/
arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/
arch/arm/mach-msm/include/mach/msm_iomap.h
@@
-47,8
+47,12
@@
#include "msm_iomap-7x30.h"
#elif defined(CONFIG_ARCH_QSD8X50)
#include "msm_iomap-8x50.h"
#include "msm_iomap-7x30.h"
#elif defined(CONFIG_ARCH_QSD8X50)
#include "msm_iomap-8x50.h"
+#elif defined(CONFIG_ARCH_MSM8X60)
+#include "msm_iomap-8x60.h"
#else
#include "msm_iomap-7x00.h"
#endif
#else
#include "msm_iomap-7x00.h"
#endif
+
+
#endif
#endif