diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-20 14:38:53 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-20 14:38:53 -0700 |
| commit | eccceebd7e7985c2371bf6624e6e174abbf37dce (patch) | |
| tree | 162d1ac3a0181fbdc766dac616985275b92e0c88 /arch/arm/mach-tegra/Makefile | |
| parent | 5d4089a4ad06980c67c8e5a2527f73e085d02423 (diff) | |
| parent | 357281ed092ac5713137fa42b447cdd68a4aa56e (diff) | |
| download | op-kernel-dev-eccceebd7e7985c2371bf6624e6e174abbf37dce.zip op-kernel-dev-eccceebd7e7985c2371bf6624e6e174abbf37dce.tar.gz | |
Merge tag 'tegra-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
Merge "ARM: tegra: core SoC changes for 3.15" from Stephen Warren:
A couple of minor fixes, plus the removal of the EMC scaling driver,
which hasn't been active since we converted clocks to device tree.
* tag 'tegra-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: Export I/O rail functions
ARM: tegra: remove tegra EMC scaling driver
ARM: tegra: don't timeout if CPU is powergated
Signed-off-by: Olof Johansson <olof@lixom.net>
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 019bb17..6fbfbb7 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -14,7 +14,6 @@ obj-y += sleep.o obj-y += tegra.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_speedo.o -obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += sleep-tegra20.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pm-tegra20.o ifeq ($(CONFIG_CPU_IDLE),y) |
