diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-09-14 13:35:16 -0400 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-09-14 13:35:16 -0400 |
| commit | fef40b2369a4ececa16b4d02b625e45252fe5d0a (patch) | |
| tree | 22445e45f0882630e410b89e2a26fd3e9ba9c30b /arch/arm/mach-tegra/Makefile | |
| parent | f49540d1d7e90dc9864d96ad5a505d7feb8efbcc (diff) | |
| parent | 363366cf61c544ea476f3d220f43a95cb03014f5 (diff) | |
Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index b129f37515bb..ed41905a3bd1 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile | |||
| @@ -23,7 +23,6 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o | |||
| 23 | obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o | 23 | obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o |
| 24 | obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o | 24 | obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o |
| 25 | obj-$(CONFIG_TEGRA_PCI) += pcie.o | 25 | obj-$(CONFIG_TEGRA_PCI) += pcie.o |
| 26 | obj-$(CONFIG_USB_SUPPORT) += usb_phy.o | ||
| 27 | 26 | ||
| 28 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-dt-tegra20.o | 27 | obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-dt-tegra20.o |
| 29 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o | 28 | obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o |