diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-24 10:00:10 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-24 10:00:10 +0000 |
| commit | d5b7d8c22678a76f2855e0c1fe94bc3886859061 (patch) | |
| tree | e497962b171ae50d546f38925042361fc8dc4318 /arch/arm/plat-mxc/Makefile | |
| parent | 78d7530ac338e458fa513527ee7bb4278d0d8017 (diff) | |
| parent | 4998f1a30cf8e21c5bc0766fde4fa58e1adabd72 (diff) | |
| download | talos-op-linux-d5b7d8c22678a76f2855e0c1fe94bc3886859061.tar.gz talos-op-linux-d5b7d8c22678a76f2855e0c1fe94bc3886859061.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/plat-mxc/Makefile')
| -rw-r--r-- | arch/arm/plat-mxc/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile index e3212c8ff421..4cbca9da1505 100644 --- a/arch/arm/plat-mxc/Makefile +++ b/arch/arm/plat-mxc/Makefile @@ -9,3 +9,6 @@ obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2.o dma-mx1-mx2.o obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o obj-$(CONFIG_MXC_PWM) += pwm.o +obj-$(CONFIG_MXC_ULPI) += ulpi.o +obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o +obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o |
