diff options
| author | Sascha Hauer | 2010-01-14 10:58:10 +0100 |
|---|---|---|
| committer | Sascha Hauer | 2010-01-14 10:58:10 +0100 |
| commit | 37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e (patch) | |
| tree | cd6d6433f1c80475f36b94b7432923b4d4b7b660 /arch/arm/plat-mxc/include/mach/mx3x.h | |
| parent | becc670a1bda8f240a93e45d9794f9f79713ffdb (diff) | |
| parent | a8dfb6462a033984b99fee4122fe0799a31f5bb4 (diff) | |
Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/mx3x.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx3x.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx3x.h b/arch/arm/plat-mxc/include/mach/mx3x.h index be69272407ad..7a356de385f5 100644 --- 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. */ -#ifndef __ASM_ARCH_MXC_MX31_H__ -#define __ASM_ARCH_MXC_MX31_H__ +#ifndef __MACH_MX3x_H__ +#define __MACH_MX3x_H__ /* * MX31 memory map: @@ -269,6 +269,7 @@ static inline int mx31_revision(void) } #endif +#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS /* 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 +#endif -#endif /* __ASM_ARCH_MXC_MX31_H__ */ +#endif /* ifndef __MACH_MX3x_H__ */ |