linux-next: manual merge of the arm-soc tree with the v4l-dvb 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,
	Vladimir Barinov <vladimir.barinov@cogentembedded.com>,
	Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
	Mauro Carvalho Chehab <mchehab@infradead.org>,
	Simon Horman <horms@verge.net.au>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Subject: linux-next: manual merge of the arm-soc tree with the v4l-dvb tree
Date: Thu, 29 Aug 2013 17:59:32 +1000	[thread overview]
Message-ID: <20130829175932.de8fe48f48a152172dd3d770@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/setup-r8a7779.c between commit 4714a0255eee
("[media] ARM: shmobile: r8a7779: add VIN support") from the v4l-dvb tree
and commit fee529df76ff ("ARM: shmobile: r8a7779: cleanup registration of
usb phy") 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-shmobile/setup-r8a7779.c
index 3d89288,6a99333..0000000

--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@@ -629,24 -648,6 +675,16 @@@ void __init r8a7779_add_ether_device(st
  					  pdata, sizeof(*pdata));
  }
  
- void __init r8a7779_add_usb_phy_device(struct rcar_phy_platform_data *pdata)
- {
- 	platform_device_register_resndata(&platform_bus, "rcar_usb_phy", -1,
- 					  usb_phy_resources,
- 					  ARRAY_SIZE(usb_phy_resources),
- 					  pdata, sizeof(*pdata));
- }
- 
 +void __init r8a7779_add_vin_device(int id, struct rcar_vin_platform_data *pdata)
 +{
 +	BUG_ON(id < 0 || id > 3);
 +
 +	vin_info_table[id]->data = pdata;
 +	vin_info_table[id]->size_data = sizeof(*pdata);
 +
 +	platform_device_register_full(vin_info_table[id]);
 +}
 +
  /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
  void __init __weak r8a7779_register_twd(void) { }
  

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