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/mx21.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/mx21.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx21.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx21.h b/arch/arm/plat-mxc/include/mach/mx21.h index 5b9f062cfd25..5e2f16e59995 100644 --- a/arch/arm/plat-mxc/include/mach/mx21.h +++ b/arch/arm/plat-mxc/include/mach/mx21.h | |||
@@ -184,6 +184,7 @@ | |||
184 | #define MX21_DMA_REQ_CSI_STAT 30 | 184 | #define MX21_DMA_REQ_CSI_STAT 30 |
185 | #define MX21_DMA_REQ_CSI_RX 31 | 185 | #define MX21_DMA_REQ_CSI_RX 31 |
186 | 186 | ||
187 | #ifdef IMX_NEEDS_DEPRECATED_SYMBOLS | ||
187 | /* these should go away */ | 188 | /* these should go away */ |
188 | #define SDRAM_BASE_ADDR MX21_SDRAM_BASE_ADDR | 189 | #define SDRAM_BASE_ADDR MX21_SDRAM_BASE_ADDR |
189 | #define CSD1_BASE_ADDR MX21_CSD1_BASE_ADDR | 190 | #define CSD1_BASE_ADDR MX21_CSD1_BASE_ADDR |
@@ -216,5 +217,6 @@ | |||
216 | #define DMA_REQ_FIRI_RX MX21_DMA_REQ_FIRI_RX | 217 | #define DMA_REQ_FIRI_RX MX21_DMA_REQ_FIRI_RX |
217 | #define DMA_REQ_BMI_TX MX21_DMA_REQ_BMI_TX | 218 | #define DMA_REQ_BMI_TX MX21_DMA_REQ_BMI_TX |
218 | #define DMA_REQ_BMI_RX MX21_DMA_REQ_BMI_RX | 219 | #define DMA_REQ_BMI_RX MX21_DMA_REQ_BMI_RX |
220 | #endif | ||
219 | 221 | ||
220 | #endif /* __ASM_ARCH_MXC_MX21_H__ */ | 222 | #endif /* __ASM_ARCH_MXC_MX21_H__ */ |