Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/Makefile between commit 598695a02180 ("ARM: tegra:
convert to twd_local_timer_register() interface")from the arm tree and
commits 249c5172e80a ("ARM: tegra: build localtimer support only when
needed") and 7ff43eeabd19 ("ARM: tegra: enable tegra30 clock framework")
from the tegra tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
diff --cc arch/arm/mach-tegra/Makefile
index f7d0443,7bea5d1..0000000
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -13,9 -17,12 +17,11 @@@ 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_SMP) += platsmp.o headsmp.o
+obj-$(CONFIG_SMP) += platsmp.o headsmp.o
+ obj-$(CONFIG_SMP) += reset.o
-obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
+ obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30_clocks.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
- obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o
+ obj-$(CONFIG_TEGRA_SYSTEM_DMA) += dma.o apbio.o
obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o
obj-$(CONFIG_TEGRA_PCI) += pcie.o
obj-$(CONFIG_USB_SUPPORT) += usb_phy.o