diff options
| author | Gary King <gking@nvidia.com> | 2009-12-11 14:12:23 -0800 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2009-12-11 14:13:37 -0800 |
| commit | fb0d4cc020403e874193ab0b6ef463414e4957c1 (patch) | |
| tree | 9cd2a41b458e9fcaf6838d32fe9fdc051cff9e7e /arch/arm/mach-tegra/Makefile | |
| parent | ca2b56d4a0d2c83b722819416dbd4387bac3c0b2 (diff) | |
tegra-rm: branch over Tegra and Tegra 2 RM from Perforce CL 5140548
Update all license grants to BSD/MIT-like
Remove some deadcode from the kernel fork of the codebase
Change-Id: I73c130a8094972497c7dc7dba65755bd16175819
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index d1dbf71f5367..7abcf1d37a9d 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -7,8 +7,11 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq.o # SMP support obj-$(CONFIG_SMP) += headsmp.o +<<<<<<< HEAD:arch/arm/mach-tegra/Makefile # System DMA obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o # NvOs / NvRm-based kernel implementation obj-$(CONFIG_MACH_TEGRA_GENERIC) += nvddk/ +# NvOs / NvRm-based kernel implementation +obj-$(CONFIG_MACH_TEGRA_GENERIC) += nvrm/ |