Merge branch 'next/cleanup' into for-next

* next/cleanup:
  ARM: sunxi: Remove the .map_io function declaration
  ARM: mxs: remove the .map_io declaration
  ARM: highbank: remove the .map_io declaration
  ARM: mmu: Call debug_ll_io_init if no map_io function is specified
  ARM: vt8500: Remove init_irq declaration in machine description
  ARM: virt: Remove init_irq declaration in machine description
  ARM: vexpress: Remove init_irq declaration in machine description
  ARM: sirf: Remove init_irq declaration in machine description
  ARM: spear: Remove init_irq declaration in machine description
  ARM: nomadik: Remove init_irq declaration in machine description

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/arm-soc-for-next-contents.txt
index f51c37c7b1a2577f66ba47709f6a9d0c32787c29,0000000000000000000000000000000000000000..5c471f4844d67e6e44f117cb67146e4d0772e0a1
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,24 -1,0 +1,26 @@@
 +for-next contents for 3.11: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
 +next/cleanup
 +      at91/cleanup
 +              git://github.com/at91linux/linux-at91.git tags/at91-cleanup
++      machdesc/cleanup
++              git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11
 +next/dt
 +      nomadik/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +next/drivers
 +      ux500/dma40
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +
 +next/mailbox:
 +      mailbox/subsystem
 +              git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox
 +
 +

diff --cc arch/arm/mach-nomadik/cpu-8815.c
index 89e2c03db178a4b53d292682809ec32303f36245,46cce9baa12926d4a85e65a0fe1a1d825efaee66..2df209ed1a07ad669e36a12db1080cafe022a92d
--- 1/arch/arm/mach-nomadik/cpu-8815.c
--- 2/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@@ -25,9 -25,10 +25,8 @@@
  #include <linux/slab.h>
  #include <linux/irq.h>
  #include <linux/dma-mapping.h>
- #include <linux/irqchip.h>
  #include <linux/platform_data/clk-nomadik.h>
 -#include <linux/platform_data/pinctrl-nomadik.h>
 -#include <linux/pinctrl/machine.h>
 -#include <linux/platform_data/clocksource-nomadik-mtu.h>
 +#include <linux/clocksource.h>
  #include <linux/of_irq.h>
  #include <linux/of_gpio.h>
  #include <linux/of_address.h>