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 'for-linus' of git://android.git.kernel.org/kernel/tegra
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
multi.h
diff --git
a/arch/arm/plat-omap/include/plat/multi.h
b/arch/arm/plat-omap/include/plat/multi.h
index
ffd909f
..
999ffba
100644
(file)
--- a/
arch/arm/plat-omap/include/plat/multi.h
+++ b/
arch/arm/plat-omap/include/plat/multi.h
@@
-66,7
+66,7
@@
# error "OMAP1 and OMAP2PLUS can't be selected at the same time"
# endif
#endif
# error "OMAP1 and OMAP2PLUS can't be selected at the same time"
# endif
#endif
-#ifdef CONFIG_
ARCH
_OMAP2420
+#ifdef CONFIG_
SOC
_OMAP2420
# ifdef OMAP_NAME
# undef MULTI_OMAP2
# define MULTI_OMAP2
# ifdef OMAP_NAME
# undef MULTI_OMAP2
# define MULTI_OMAP2
@@
-74,7
+74,7
@@
# define OMAP_NAME omap2420
# endif
#endif
# define OMAP_NAME omap2420
# endif
#endif
-#ifdef CONFIG_
ARCH
_OMAP2430
+#ifdef CONFIG_
SOC
_OMAP2430
# ifdef OMAP_NAME
# undef MULTI_OMAP2
# define MULTI_OMAP2
# ifdef OMAP_NAME
# undef MULTI_OMAP2
# define MULTI_OMAP2