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 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
mxc.h
diff --git
a/arch/arm/plat-mxc/include/mach/mxc.h
b/arch/arm/plat-mxc/include/mach/mxc.h
index
4ac53ce
..
0987923
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/mxc.h
+++ b/
arch/arm/plat-mxc/include/mach/mxc.h
@@
-68,7
+68,7
@@
extern unsigned int __mxc_cpu_type;
#endif
extern unsigned int __mxc_cpu_type;
#endif
-#ifdef CONFIG_
ARCH_
MX1
+#ifdef CONFIG_
SOC_I
MX1
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
@@
-80,7
+80,7
@@
extern unsigned int __mxc_cpu_type;
# define cpu_is_mx1() (0)
#endif
# define cpu_is_mx1() (0)
#endif
-#ifdef CONFIG_
MACH_
MX21
+#ifdef CONFIG_
SOC_I
MX21
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
@@
-92,7
+92,7
@@
extern unsigned int __mxc_cpu_type;
# define cpu_is_mx21() (0)
#endif
# define cpu_is_mx21() (0)
#endif
-#ifdef CONFIG_
ARCH_
MX25
+#ifdef CONFIG_
SOC_I
MX25
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
@@
-104,7
+104,7
@@
extern unsigned int __mxc_cpu_type;
# define cpu_is_mx25() (0)
#endif
# define cpu_is_mx25() (0)
#endif
-#ifdef CONFIG_
MACH_
MX27
+#ifdef CONFIG_
SOC_I
MX27
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type