From: Olof Johansson <olof@lixom.net>
Date: Thu, 11 Apr 2013 10:39:00 +0000 (-0700)
Subject: Merge tag 'sunxi-cleanup-for-3.10' of git://github.com/mripard/linux into next/cleanup
X-Git-Tag: v3.10-rc1~125^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9d5868e342a9802db7b299be511ac547ff1034d;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

From Maxime Ripard:
Cleanups for Allwinner sunXi architecture:
  - Remove sunxi.dtsi
  - Switch to clocksource/irqchip device tree handlers
  - Cleanup the watchdog code

* tag 'sunxi-cleanup-for-3.10' of git://github.com/mripard/linux:
  ARM: sunxi: Rework the restart code
  irqchip: sunxi: Rename sunxi to sun4i
  irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
  clocksource: sunxi: Rename sunxi to sun4i
  clocksource: sunxi: make use of CLKSRC_OF
  clocksource: sunxi: Cleanup the timer code
  clocksource: make CLOCKSOURCE_OF_DECLARE type safe

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

Add/change conflict in drivers/clocksource/Makefile resolved.
---

b9d5868e342a9802db7b299be511ac547ff1034d
diff --cc drivers/clocksource/Makefile
index 89c5adc,7d5d23a..98f220a
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -16,8 -16,7 +16,8 @@@ obj-$(CONFIG_CLKSRC_NOMADIK_MTU)	+= nom
  obj-$(CONFIG_CLKSRC_DBX500_PRCMU)	+= clksrc-dbx500-prcmu.o
  obj-$(CONFIG_ARMADA_370_XP_TIMER)	+= time-armada-370-xp.o
  obj-$(CONFIG_ARCH_BCM2835)	+= bcm2835_timer.o
 +obj-$(CONFIG_ARCH_MXS)		+= mxs_timer.o
- obj-$(CONFIG_SUNXI_TIMER)	+= sunxi_timer.o
+ obj-$(CONFIG_SUN4I_TIMER)	+= sun4i_timer.o
  obj-$(CONFIG_ARCH_TEGRA)	+= tegra20_timer.o
  obj-$(CONFIG_VT8500_TIMER)	+= vt8500_timer.o
  
diff --cc drivers/irqchip/Makefile
index 9d8f4f1,5416965..d5e119c
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -2,10 -2,9 +2,10 @@@ obj-$(CONFIG_IRQCHIP)			+= irqchip.
  
  obj-$(CONFIG_ARCH_BCM2835)		+= irq-bcm2835.o
  obj-$(CONFIG_ARCH_EXYNOS)		+= exynos-combiner.o
 +obj-$(CONFIG_ARCH_MXS)			+= irq-mxs.o
  obj-$(CONFIG_METAG)			+= irq-metag-ext.o
  obj-$(CONFIG_METAG_PERFCOUNTER_IRQS)	+= irq-metag.o
- obj-$(CONFIG_ARCH_SUNXI)		+= irq-sunxi.o
+ obj-$(CONFIG_ARCH_SUNXI)		+= irq-sun4i.o
  obj-$(CONFIG_ARCH_SPEAR3XX)		+= spear-shirq.o
  obj-$(CONFIG_ARM_GIC)			+= irq-gic.o
  obj-$(CONFIG_ARM_VIC)			+= irq-vic.o