summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/include/mach/mx2x.h
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2009-12-17 17:17:54 +0100
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-01-08 16:45:20 +0100
commitaae7019382896cf1075a93acc564e42601bc44a2 (patch)
tree410296136a448fb45c8129b0dd62a099440c9b92 /arch/arm/plat-mxc/include/mach/mx2x.h
parentimx: mangle addresses after adding the offset (diff)
downloadlinux-aae7019382896cf1075a93acc564e42601bc44a2.tar.xz
linux-aae7019382896cf1075a93acc564e42601bc44a2.zip
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/mx2x.h')
-rw-r--r--arch/arm/plat-mxc/include/mach/mx2x.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx2x.h b/arch/arm/plat-mxc/include/mach/mx2x.h
index f2eaf140ed02..396470e8d93e 100644
--- a/arch/arm/plat-mxc/include/mach/mx2x.h
+++ b/arch/arm/plat-mxc/include/mach/mx2x.h
@@ -176,6 +176,7 @@
#define MX2x_DMA_REQ_CSI_STAT 30
#define MX2x_DMA_REQ_CSI_RX 31
+#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS
/* these should go away */
#define AIPI_BASE_ADDR MX2x_AIPI_BASE_ADDR
#define AIPI_BASE_ADDR_VIRT MX2x_AIPI_BASE_ADDR_VIRT
@@ -287,5 +288,6 @@
#define DMA_REQ_UART1_TX MX2x_DMA_REQ_UART1_TX
#define DMA_REQ_CSI_STAT MX2x_DMA_REQ_CSI_STAT
#define DMA_REQ_CSI_RX MX2x_DMA_REQ_CSI_RX
+#endif
#endif /* __ASM_ARCH_MXC_MX2x_H__ */