From: Olof Johansson <olof@lixom.net>
Date: Sat, 15 Jun 2013 01:41:44 +0000 (-0700)
Subject: Merge tag 'sunxi-core-for-3.11' of git://github.com/mripard/linux into next/cleanup
X-Git-Tag: v3.11-rc1~154^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75d39696d31fa8ef4a099a37d1b6b4e91c9a8775;p=profile%2Fcommon%2Fkernel-common.git

Merge tag 'sunxi-core-for-3.11' of git://github.com/mripard/linux into next/cleanup

From Maxime Ripard:
Allwinner SoCs platform additions for 3.11
  - Various cleanups and documentation updates

* tag 'sunxi-core-for-3.11' of git://github.com/mripard/linux:
  ARM: sunxi: irqchip: Update the documentation
  ARM: sunxi: Update datasheet documentation
  ARM: sunxi: Remove init_irq declaration in machine description

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

	#
---

75d39696d31fa8ef4a099a37d1b6b4e91c9a8775
diff --cc arch/arm/mach-sunxi/sunxi.c
index d1b5bc5,08937a3..a3a755f
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@@ -100,7 -115,7 +99,6 @@@ static const char * const sunxi_board_d
  
  DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
  	.init_machine	= sunxi_dt_init,
- 	.init_irq	= irqchip_init,
 -	.map_io		= sunxi_map_io,
  	.init_time	= sunxi_timer_init,
  	.dt_compat	= sunxi_board_dt_compat,
  MACHINE_END