diff options
author | Justin Waters <justin.waters@timesys.com> | 2013-03-29 13:08:55 -0400 |
---|---|---|
committer | Justin Waters <justin.waters@timesys.com> | 2013-03-29 13:08:55 -0400 |
commit | 21ceb093d796e94500502eee94a8cd5fcc76f619 (patch) | |
tree | 8f3255c05b10b382a361e1eca47794b3485c2572 /arch/arm/mach-mvf/Makefile | |
parent | f962cbcefdfad22ffff41e19ad4c5ff58815c05c (diff) | |
parent | fcbe1245c34fa407ff20d6afd2f975e8f961a17b (diff) |
Merge branch '3.0-pcm052' of ssh://github.com/tsfs/Vybrid-Linux into 3.0-pcm0523.0-pcm052-ts2.1
Diffstat (limited to 'arch/arm/mach-mvf/Makefile')
-rw-r--r-- | arch/arm/mach-mvf/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvf/Makefile b/arch/arm/mach-mvf/Makefile index fad70a4a9dc7..3128d4288c3d 100644 --- a/arch/arm/mach-mvf/Makefile +++ b/arch/arm/mach-mvf/Makefile @@ -3,7 +3,7 @@ # # 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 pm.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 mvf_sema4.o obj-y += l2switch.o obj-$(CONFIG_ARCH_MVFA5) += clock.o mvf_suspend.o |