linux-next: manual merge of the arm-soc tree with the xilinx tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Soren Brinkmann <soren.brinkmann@xilinx.com>,
	John Linn <John.Linn@xilinx.com>,
	Stephen Warren <swarren@nvidia.com>
Subject: linux-next: manual merge of the arm-soc tree with the xilinx tree
Date: Fri, 11 Jan 2013 14:51:59 +1100	[thread overview]
Message-ID: <20130111145159.dfc665289a312bf4b069eb16@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1009 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-zynq/common.c between commit 453708c6da9b ("arm: zynq:
timer: Replace PSS through PS") from the xilinx tree and commit
6bb27d7349db ("ARM: delete struct sys_timer") from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-zynq/common.c
index 892f65e,2ae4bce..0000000

--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@@ -90,16 -90,9 +90,9 @@@ static void __init xilinx_zynq_timer_in
  
  	xilinx_zynq_clocks_init(slcr);
  
 -	xttcpss_timer_init();
 +	xttcps_timer_init();
  }
  
- /*
-  * Instantiate and initialize the system timer structure
-  */
- static struct sys_timer xttcps_sys_timer = {
- 	.init		= xilinx_zynq_timer_init,
- };
- 
  /**
   * xilinx_map_io() - Create memory mappings needed for early I/O.
   */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
