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/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
mx3x.h
diff --git
a/arch/arm/plat-mxc/include/mach/mx3x.h
b/arch/arm/plat-mxc/include/mach/mx3x.h
index
be69272
..
7a356de
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/mx3x.h
+++ b/
arch/arm/plat-mxc/include/mach/mx3x.h
@@
-8,8
+8,8
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-#ifndef __
ASM_ARCH_MXC_MX31
_H__
-#define __
ASM_ARCH_MXC_MX31
_H__
+#ifndef __
MACH_MX3x
_H__
+#define __
MACH_MX3x
_H__
/*
* MX31 memory map:
/*
* MX31 memory map:
@@
-269,6
+269,7
@@
static inline int mx31_revision(void)
}
#endif
}
#endif
+#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS
/* these should go away */
#define L2CC_BASE_ADDR MX3x_L2CC_BASE_ADDR
#define L2CC_SIZE MX3x_L2CC_SIZE
/* these should go away */
#define L2CC_BASE_ADDR MX3x_L2CC_BASE_ADDR
#define L2CC_SIZE MX3x_L2CC_SIZE
@@
-401,5
+402,6
@@
static inline int mx31_revision(void)
#define CHIP_REV_3_2 MX3x_CHIP_REV_3_2
#define SYSTEM_REV_MIN MX3x_SYSTEM_REV_MIN
#define SYSTEM_REV_NUM MX3x_SYSTEM_REV_NUM
#define CHIP_REV_3_2 MX3x_CHIP_REV_3_2
#define SYSTEM_REV_MIN MX3x_SYSTEM_REV_MIN
#define SYSTEM_REV_NUM MX3x_SYSTEM_REV_NUM
+#endif
-#endif /*
__ASM_ARCH_MXC_MX31
_H__ */
+#endif /*
ifndef __MACH_MX3x
_H__ */