diff options
| author | Adam Lussier <adam.lussier@timesys.com> | 2013-02-25 17:19:04 -0500 |
|---|---|---|
| committer | Adam Lussier <adam.lussier@timesys.com> | 2013-02-25 17:19:04 -0500 |
| commit | f962cbcefdfad22ffff41e19ad4c5ff58815c05c (patch) | |
| tree | e9424582f1fdc92d360ff58c831ddf801a268e3f /arch/arm/mach-mvf/Makefile | |
| parent | 15f55e0b22f8953b56fb5d6bdf8b770228f2f449 (diff) | |
| parent | 16af5ee7d9556c47b332788e4107cbed5ee7ec10 (diff) | |
Merge remote-tracking branch 'github/3.0-pcm052' into 3.0-pcm0523.0-pcm052-ts2
Release 3.0-ts2: enable USB support for the phyCORE Vybrid
Diffstat (limited to 'arch/arm/mach-mvf/Makefile')
| -rw-r--r-- | arch/arm/mach-mvf/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvf/Makefile b/arch/arm/mach-mvf/Makefile index 07f33a555dcb..fad70a4a9dc7 100644 --- a/arch/arm/mach-mvf/Makefile +++ b/arch/arm/mach-mvf/Makefile @@ -3,9 +3,9 @@ # # Object file lists. -obj-y := cpu.o mm.o system.o devices.o dummy_gpio.o irq.o bus_freq.o mvf_fec.o usb_dr.o usb_dr2.o +obj-y := cpu.o mm.o system.o devices.o dummy_gpio.o irq.o bus_freq.o mvf_fec.o usb_dr.o usb_dr2.o pm.o obj-y += l2switch.o -obj-$(CONFIG_ARCH_MVFA5) += clock.o +obj-$(CONFIG_ARCH_MVFA5) += clock.o mvf_suspend.o obj-$(CONFIG_MACH_MVFA5_TWR_VF700) += board-twr-vf700.o obj-$(CONFIG_MACH_PCM052) += board-pcm052.o |