From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tomi Valkeinen <tomi.valkeinen@nokia•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Russell King <rmk+kernel@arm•linux.org.uk>,
Tony Lindgren <tony@atomide•com>,
linux-omap@vger•kernel.org,
Senthilvadivu Guruswamy <svadivu@ti•com>,
Sumit Semwal <sumit.semwal@ti•com>
Subject: linux-next: manual merge of the omap_dss2 tree with the omap tree
Date: Fri, 18 Feb 2011 13:25:15 +1100 [thread overview]
Message-ID: <20110218132515.e071230f.sfr@canb.auug.org.au> (raw)
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-am3517evm.c between commit
3dc3bad6f1b316d79d9d1d596a590b5097cb3dc4 ("ARM: OMAP2: use early init
hook") from the omap tree and commit
603aa0662c26ad05c3ecf1b912f8bebf76dab73d ("OMAP2, 3: DSS2: board files:
replace platform_device_register with omap_display_init()") from the
omap_dss2 tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/mach-omap2/board-am3517evm.c
index d0d0f55,548f524..0000000
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@@ -392,11 -384,7 +384,7 @@@ static struct omap_dss_board_info am351
static struct omap_board_config_kernel am3517_evm_config[] __initdata = {
};
- static struct platform_device *am3517_evm_devices[] __initdata = {
- &am3517_evm_dss_device,
- };
-
-static void __init am3517_evm_init_irq(void)
+static void __init am3517_evm_init_early(void)
{
omap_board_config = am3517_evm_config;
omap_board_config_size = ARRAY_SIZE(am3517_evm_config);
next reply other threads:[~2011-02-18 2:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-18 2:25 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-02-21 3:16 linux-next: manual merge of the omap_dss2 tree with the omap tree Stephen Rothwell
2011-02-21 8:47 ` Tomi Valkeinen
2011-02-24 21:23 ` Tony Lindgren
2011-02-17 2:10 Stephen Rothwell
2011-02-17 2:10 Stephen Rothwell
2010-05-07 3:43 Stephen Rothwell
2010-05-10 20:20 ` Tony Lindgren
2010-05-12 8:59 ` Tomi Valkeinen
2010-05-14 19:09 ` Tony Lindgren
2010-05-17 7:07 ` Tomi Valkeinen
2010-03-11 4:18 Stephen Rothwell
2010-03-11 16:53 ` Tony Lindgren
2010-03-11 22:18 ` Stephen Rothwell
2010-02-08 6:25 Stephen Rothwell
2010-02-08 9:29 ` Tomi Valkeinen
2010-02-08 10:57 ` Stephen Rothwell
2010-02-08 11:43 ` Tomi Valkeinen
2010-02-09 16:52 ` Tony Lindgren
2010-02-10 8:20 ` Tomi Valkeinen
2010-02-10 9:52 ` Hiremath, Vaibhav
2010-02-03 4:29 Stephen Rothwell
2010-02-03 12:29 ` Grazvydas Ignotas
2010-02-03 17:12 ` Tony Lindgren
2010-02-04 9:42 ` Tomi Valkeinen
2009-12-09 3:59 Stephen Rothwell
2009-11-16 5:04 Stephen Rothwell
2009-11-16 10:06 ` Tomi Valkeinen
2009-11-16 18:34 ` Tony Lindgren
2009-11-17 10:00 ` Tomi Valkeinen
2009-11-17 23:49 ` 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110218132515.e071230f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-omap@vger$(echo .)kernel.org \
--cc=rmk+kernel@arm$(echo .)linux.org.uk \
--cc=sumit.semwal@ti$(echo .)com \
--cc=svadivu@ti$(echo .)com \
--cc=tomi.valkeinen@nokia$(echo .)com \
--cc=tony@atomide$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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