From: Olof Johansson <olof@lixom.net>
Date: Sun, 9 Jun 2013 05:31:06 +0000 (-0700)
Subject: Merge branch 'next/fixes-non-critical' into for-next
X-Git-Tag: next-20130617~16^2~52
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=78ae535b28570db85c55508bfb791c7d8f6f8e30;p=karo-tx-linux.git

Merge branch 'next/fixes-non-critical' into for-next

* next/fixes-non-critical:
  arm: prima2: use of_platform_populate instead of of_platform_bus_probe
  ARM: prima2: fix a checkpatch issue
  ARM: prima2: Replace include linux/module.h with linux/export.h

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

78ae535b28570db85c55508bfb791c7d8f6f8e30
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 181eff7a66ec,000000000000..aa99b44c25ac
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,72 -1,0 +1,74 @@@
 +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>
 +		<...>
 +	<...>
 +
 +depends/rmk-devel-stable
 +	http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git devel-stable
 +
 +next/fixes-non-critical
 +	mvebu/fixes-non-critical
 +		git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
++	sirf/fixes-non-critical
++		git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git tags/sirf-arm-soc-v3.10-fixes
 +
 +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
 +	mvebu/cleanup
 +		git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3
 +	dt/pci-helpers
 +		git://git.infradead.org/users/jcooper/linux.git tags/of_pci-3.11
 +
 +next/soc
 +	mvebu/soc
 +		git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2
 +	mvebu/defconfig
 +		git://git.infradead.org/users/jcooper/linux.git tags/defconfig-3.11-3
 +	mvebu/pcie
 +		git://git.infradead.org/users/jcooper/linux.git tags/pcie-3.11-2
 +	mvebu/pcie-kirkwood
 +		git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11
 +	mvebu/pcie2
 +		git://git.infradead.org/users/jcooper/linux.git tags/pcie_bridge-3.11
 +	mvebu/clk-cleanup
 +		git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11
 +	vexpress/dual-cluster
 +		git://git.linaro.org/people/nico/linux VExpress_DCSCB
 +		depends on depends/rmk-devel-stable
 +		+patch "drivers/bus: arm-cci: fix combined ARMv6+v7 build"
 +	zynq/clk
 +		git://git.xilinx.com/linux-xlnx tags/zynq-clk-for-3.11
 +
 +
 +next/boards
 +	mvebu/boards
 +		  git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2
 +
 +
 +next/dt
 +	nomadik/dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +	mvebu/dt
 +		git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-3
 +	patch
 +		"ARM: nomadik: fix clocksource warning"
 +	at91/dt
 +		git://github.com/at91linux/linux-at91.git tags/at91-dt
 +
 +
 +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-prima2/common.c
index a9f475cdf603,e588c2152133..2c70f74fed5d
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@@ -54,8 -45,8 +44,7 @@@ DT_MACHINE_START(ATLAS6_DT, "Generic AT
  	/* Maintainer: Barry Song <baohua.song@csr.com> */
  	.nr_irqs	= 128,
  	.map_io         = sirfsoc_map_io,
 -	.init_irq	= irqchip_init,
  	.init_time	= sirfsoc_init_time,
- 	.init_machine	= sirfsoc_mach_init,
  	.init_late	= sirfsoc_init_late,
  	.dt_compat      = atlas6_dt_match,
  	.restart	= sirfsoc_restart,
@@@ -72,9 -63,9 +61,8 @@@ DT_MACHINE_START(PRIMA2_DT, "Generic PR
  	/* Maintainer: Barry Song <baohua.song@csr.com> */
  	.nr_irqs	= 128,
  	.map_io         = sirfsoc_map_io,
 -	.init_irq	= irqchip_init,
  	.init_time	= sirfsoc_init_time,
  	.dma_zone_size	= SZ_256M,
- 	.init_machine	= sirfsoc_mach_init,
  	.init_late	= sirfsoc_init_late,
  	.dt_compat      = prima2_dt_match,
  	.restart	= sirfsoc_restart,
@@@ -91,8 -82,8 +79,7 @@@ DT_MACHINE_START(MARCO_DT, "Generic MAR
  	/* Maintainer: Barry Song <baohua.song@csr.com> */
  	.smp            = smp_ops(sirfsoc_smp_ops),
  	.map_io         = sirfsoc_map_io,
 -	.init_irq	= irqchip_init,
  	.init_time	= sirfsoc_init_time,
- 	.init_machine	= sirfsoc_mach_init,
  	.init_late	= sirfsoc_init_late,
  	.dt_compat      = marco_dt_match,
  	.restart	= sirfsoc_restart,