linux-next: manual merge of the tegra tree with the i2c tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/tegra.c between commit 49a64ac555f1 ("i2c: tegra:
assume CONFIG_OF, remove platform data") from the i2c tree and commit
d591fdf8e23e ("ARM: tegra: expose chip ID and revision") from the tegra
tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-tegra/tegra.c
index 6e1c9a9,84deeab..0000000
--- a/arch/arm/mach-tegra/tegra.c
+++ b/arch/arm/mach-tegra/tegra.c
@@@ -30,6 -31,10 +31,8 @@@
  #include <linux/pda_power.h>
  #include <linux/platform_data/tegra_usb.h>
  #include <linux/io.h>
 -#include <linux/i2c.h>
 -#include <linux/i2c-tegra.h>
+ #include <linux/slab.h>
+ #include <linux/sys_soc.h>
  #include <linux/usb/tegra_usb_phy.h>
  
  #include <asm/mach-types.h>

Attachment: pgp00000.pgp
Description: PGP signature