archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the tegra tree with the i2c tree
@ 2013-04-02  7:10 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-04-02  7:10 UTC (permalink / raw)
  To: Stephen Warren, Colin Cross, Olof Johansson
  Cc: linux-next, linux-kernel, Wolfram Sang, Wolfram Sang, Danny Huang

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

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

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

Stephen Rothwell          

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 #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-04-02  7:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-02  7:10 linux-next: manual merge of the tegra tree with the i2c tree Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).