archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Olof Johansson <>, Arnd Bergmann <>,
	Timo Kokkonen <>,
	Mauro Carvalho Chehab <>,
	Tony Lindgren <>
Subject: linux-next: manual merge of the arm-soc tree with the v4l-dvb tree
Date: Mon, 24 Sep 2012 19:10:53 +1000	[thread overview]
Message-ID: <> (raw)

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit 322c183cdc5f
("[media] ARM: mach-omap2: board-rx51-peripherals: Add lirc-rx51 data")
from the v4l-dvb tree and commits 2203747c9771 ("ARM: omap: move
platform_data definitions") and 606281525fb7 ("ARM: OMAP2+: Make
gpmc-smc91x.h local") from the arm-soc tree.

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

Stephen Rothwell          

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index ca07264,3945c50..0000000
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -30,13 -33,9 +33,10 @@@
  #include "common.h"
  #include <plat/dma.h>
  #include <plat/gpmc.h>
- #include <plat/onenand.h>
- #include <plat/gpmc-smc91x.h>
 +#include <plat/omap-pm.h>
+ #include "gpmc-smc91x.h"
- #include <mach/board-rx51.h>
+ #include "board-rx51.h"
  #include <sound/tlv320aic3x.h>
  #include <sound/tpa6130a2-plat.h>

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

             reply	other threads:[~2012-09-24  9:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-24  9:10 Stephen Rothwell [this message]
2013-08-29  7:35 linux-next: manual merge of the arm-soc tree with the v4l-dvb tree Stephen Rothwell
2013-08-29  7:40 Stephen Rothwell
2013-08-29  7:47 Stephen Rothwell
2013-08-29  7:50 Stephen Rothwell
2013-08-29  7:56 Stephen Rothwell
2013-08-29  7:59 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).