diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2009-12-17 11:17:54 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-08 10:45:20 -0500 |
commit | aae7019382896cf1075a93acc564e42601bc44a2 (patch) | |
tree | 410296136a448fb45c8129b0dd62a099440c9b92 /arch/arm/plat-mxc/include/mach/mx31.h | |
parent | a9b7a2dd217bd43e122b604ec99b63e0211c38aa (diff) |
imx: only define deprecated symbols conditionally
Define deprecated symbols in an #ifdef IMX_NEEDS_DEPRECATED_SYMBOLS ...
All files that still depend on the old definitions get
-DIMX_NEEDS_DEPRECATED_SYMBOLS passed to the compiler.
When all remaining users are fixed this allows including the soc
specific headers unconditionally.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Eric Benard <eric@eukrea.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Alan Carvalho de Assis <acassis@gmail.com>
Cc: Daniel Mack <daniel@caiaq.de>
Cc: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Cc: Ilya Yanok <yanok@emcraft.com>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Magnus Lilja <lilja.magnus@gmail.com>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/mx31.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx31.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h index 0c005af2c8cf..53da4c5976a9 100644 --- a/arch/arm/plat-mxc/include/mach/mx31.h +++ b/arch/arm/plat-mxc/include/mach/mx31.h | |||
@@ -193,6 +193,7 @@ | |||
193 | #define MX31_SYSTEM_REV_MIN MX31_CHIP_REV_1_0 | 193 | #define MX31_SYSTEM_REV_MIN MX31_CHIP_REV_1_0 |
194 | #define MX31_SYSTEM_REV_NUM 3 | 194 | #define MX31_SYSTEM_REV_NUM 3 |
195 | 195 | ||
196 | #ifdef IMX_NEEDS_DEPRECATED_SYMBOLS | ||
196 | /* these should go away */ | 197 | /* these should go away */ |
197 | #define ATA_BASE_ADDR MX31_ATA_BASE_ADDR | 198 | #define ATA_BASE_ADDR MX31_ATA_BASE_ADDR |
198 | #define UART4_BASE_ADDR MX31_UART4_BASE_ADDR | 199 | #define UART4_BASE_ADDR MX31_UART4_BASE_ADDR |
@@ -223,3 +224,4 @@ | |||
223 | #define MXC_INT_UART5 MX31_INT_UART5 | 224 | #define MXC_INT_UART5 MX31_INT_UART5 |
224 | #define MXC_INT_CCM MX31_INT_CCM | 225 | #define MXC_INT_CCM MX31_INT_CCM |
225 | #define MXC_INT_PCMCIA MX31_INT_PCMCIA | 226 | #define MXC_INT_PCMCIA MX31_INT_PCMCIA |
227 | #endif | ||