diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-14 20:01:56 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-14 20:01:56 +0300 |
commit | b89371621e5bedc84498ced2c5c33976bd1b2f64 (patch) | |
tree | b309919239586e25617a17785b827577b1abb6b5 /arch/arm/plat-mxc/Makefile | |
parent | 63978ab3e3e963db28093b53bb4598f2702e1ad7 (diff) | |
parent | 74c2b45b714e49b427584b4bd8f44f1a24d82d9c (diff) | |
download | linux-b89371621e5bedc84498ced2c5c33976bd1b2f64.tar.xz |
Merge branch 'next/isa' into topic/misc
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 |