Merge tag 'realview-broomstick-sweep' of git://git.kernel.org/pub/scm/linux/kernel...

Merge "delete the RealView boardfiles" from Linus Walleij:

This deletes the realview boardfiles, consolidates a bit
around the Kconfig options and leaves the mach-realview
directory nice and tidy, with all boards migrated over to
Device Tree.

* tag 'realview-broomstick-sweep' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: imply device tree boot
  ARM: realview: no need to select SMP_ON_UP explicitly
  ARM: realview: delete the RealView board files

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-realview/Makefile
index 4048821,6df86c2..adf39ad
--- 1/arch/arm/mach-realview/Makefile
--- 2/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@@ -1,18 -1,9 +1,8 @@@
  #
  # Makefile for the linux kernel.
  #
 -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
 -      -I$(srctree)/arch/arm/plat-versatile/include
 +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-versatile/include
  
- obj-y                                 := core.o
- obj-$(CONFIG_REALVIEW_DT)             += realview-dt.o
+ obj-y                                 += realview-dt.o
  obj-$(CONFIG_SMP)                     += platsmp-dt.o
- 
- ifdef CONFIG_ATAGS
- obj-$(CONFIG_MACH_REALVIEW_EB)                += realview_eb.o
- obj-$(CONFIG_MACH_REALVIEW_PB11MP)    += realview_pb11mp.o
- obj-$(CONFIG_MACH_REALVIEW_PB1176)    += realview_pb1176.o
- obj-$(CONFIG_MACH_REALVIEW_PBA8)      += realview_pba8.o
- obj-$(CONFIG_MACH_REALVIEW_PBX)               += realview_pbx.o
- obj-$(CONFIG_SMP)                     += platsmp.o
- endif
  obj-$(CONFIG_HOTPLUG_CPU)             += hotplug.o