From: Olof Johansson <olof@lixom.net>
Date: Sat, 1 Jun 2013 05:09:06 +0000 (-0700)
Subject: Merge branch 'next/cleanup' into for-next
X-Git-Tag: next-20130607~15^2~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aa96a3890b98c5a3e373bc6438bbab127d542dbb;p=karo-tx-linux.git

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>
---

aa96a3890b98c5a3e373bc6438bbab127d542dbb
diff --cc arch/arm/arm-soc-for-next-contents.txt
index f51c37c7b1a2,000000000000..5c471f4844d6
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ 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 89e2c03db178,46cce9baa129..2df209ed1a07
--- a/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>