diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
| commit | f987e832a9e79d2ce8009a5ea9c7b677624b3b30 (patch) | |
| tree | 0dd09a5e6b4c60ee0a9916907dfc2cda83f3e496 /arch/arm/mach-tegra/Makefile | |
| parent | f737b7f46a72c099cf8ac88baff02fbf61b1a47c (diff) | |
| parent | fc993d9bc48f772133d8cd156c67c296477db070 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/usb_phy.c
drivers/usb/gadget/tegra_udc.c
drivers/usb/otg/Makefile
drivers/video/tegra/fb.c
sound/soc/tegra/tegra_pcm.c
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index c1a76685c31d..9a476876374a 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -19,6 +19,7 @@ obj-y += tegra2_clocks.o obj-y += timer-t2.o else obj-y += tegra3_clocks.o +obj-$(CONFIG_DEBUG_FS) += clocks_stats.o obj-y += timer-t3.o endif obj-y += pinmux.o @@ -38,7 +39,7 @@ AFLAGS_sleep.o :=-Wa,-march=armv7-a$(plus_sec) obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += sleep-t2.o obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += sleep-t3.o -obj-y += fuse.o +obj-y += tegra_fuse.o obj-y += kfuse.o obj-y += csi.o obj-$(CONFIG_TEGRA_SILICON_PLATFORM) += tegra_odm_fuses.o @@ -171,6 +172,7 @@ obj-${CONFIG_MACH_WHISTLER} += board-whistler-memory.o obj-${CONFIG_MACH_CARDHU} += board-cardhu.o obj-${CONFIG_MACH_CARDHU} += board-cardhu-kbc.o +obj-${CONFIG_MACH_CARDHU} += board-cardhu-irda.o obj-${CONFIG_MACH_CARDHU} += board-cardhu-panel.o obj-${CONFIG_MACH_CARDHU} += board-cardhu-pinmux.o obj-${CONFIG_MACH_CARDHU} += board-cardhu-power.o @@ -195,6 +197,11 @@ obj-${CONFIG_MACH_P1852} += board-p1852-panel.o obj-${CONFIG_MACH_P1852} += board-p1852-pinmux.o obj-${CONFIG_MACH_P1852} += board-p1852-sdhci.o +obj-${CONFIG_MACH_E1853} += board-e1853.o +obj-${CONFIG_MACH_E1853} += board-e1853-panel.o +obj-${CONFIG_MACH_E1853} += board-e1853-pinmux.o +obj-${CONFIG_MACH_E1853} += board-e1853-sdhci.o + obj-${CONFIG_MACH_TEGRA_ENTERPRISE} += board-enterprise.o obj-${CONFIG_MACH_TEGRA_ENTERPRISE} += board-enterprise-panel.o obj-${CONFIG_MACH_TEGRA_ENTERPRISE} += board-enterprise-pinmux.o |