diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-14 11:56:52 -0400 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 02:59:58 -0400 |
| commit | 9f72ffedc8409b9c9cbe17a9f66c2982baa4ff52 (patch) | |
| tree | f996492cf0eebe5bb6f164776db25865c7ab8991 /arch/arm/mach-imx/Makefile | |
| parent | e780d2392dd37fcc231d97400c1cdd8d261ed556 (diff) | |
ARM: imx: new Kconfig symbol and feature test macro for DMA on mx1 and mx2
This should be used instead of hard coding the corresponding platforms.
The feature test macro is needed to support different SOCs in a single
kernel image. While at it rename dma-mx1-mx2 to dma-v1 as mx25 doesn't
use it and so the mx2 part is wrong and move the header to
arch/arm/mach-imx.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index e56a1191c9df..86b53e6bc94e 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile | |||
| @@ -6,6 +6,8 @@ | |||
| 6 | 6 | ||
| 7 | obj-y := devices.o | 7 | obj-y := devices.o |
| 8 | 8 | ||
| 9 | obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o | ||
| 10 | |||
| 9 | obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o | 11 | obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o |
| 10 | obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o | 12 | obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o |
| 11 | 13 | ||