From: Olof Johansson Date: Wed, 28 Mar 2012 00:19:15 +0000 (-0700) Subject: Merge branch 'tegra/soc' into next/cleanup2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b521d929b330d665cb3a42b26eaaa5690dc9dad7;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'tegra/soc' into next/cleanup2 Conflicts: arch/arm/mach-tegra/Makefile Signed-off-by: Olof Johansson --- b521d929b330d665cb3a42b26eaaa5690dc9dad7 diff --cc arch/arm/mach-tegra/Makefile index 829066fdc2ad,fc4ebe35f484..7517efbcf927 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@@ -13,8 -15,8 +15,9 @@@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += teg obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pinmux-tegra20-tables.o obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += pinmux-tegra30-tables.o obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o + obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o -obj-$(CONFIG_SMP) += platsmp.o localtimer.o headsmp.o +obj-$(CONFIG_SMP) += platsmp.o headsmp.o +obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o