diff options
author | Tom Cherry <tcherry@nvidia.com> | 2012-05-30 18:18:17 -0700 |
---|---|---|
committer | Tom Cherry <tcherry@nvidia.com> | 2012-05-30 18:18:17 -0700 |
commit | 7af2c7ce772882f6e85e2a357711bf822f066bfa (patch) | |
tree | 2a1307a8096a62d4252a7c382f43204da3325401 /arch/arm/mach-tegra/Makefile | |
parent | d92da78335899834f8f667eb7c865aaf47bdff48 (diff) | |
parent | c9d3eda2af45736e73f0dfd2261257e083f3758a (diff) |
Merge commit 'main-ics-2012.05.30-A1' into dev-jb-staging
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
-rw-r--r-- | arch/arm/mach-tegra/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 6b1c4c52c713..3153203c6efc 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -44,6 +44,8 @@ obj-y += i2c_error_recovery.o obj-y += mc.o obj-$(CONFIG_TEGRA_STAT_MON) += tegra2_statmon.o obj-$(CONFIG_USB_SUPPORT) += usb_phy.o +obj-$(CONFIG_USB_SUPPORT) += tegra3_usb_phy.o +obj-$(CONFIG_USB_SUPPORT) += tegra2_usb_phy.o obj-$(CONFIG_FIQ) += fiq.o obj-$(CONFIG_TEGRA_FIQ_DEBUGGER) += tegra_fiq_debugger.o obj-$(CONFIG_TEGRA_PWM) += pwm.o |