From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Martin Fuzzey" <mfuzzey@gmail•com>,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix•de>,
"Sascha Hauer" <s.hauer@pengutronix•de>
Subject: linux-next: manual merge of the usb tree with the i.MX tree
Date: Fri, 26 Feb 2010 18:10:03 +1100 [thread overview]
Message-ID: <20100226181003.a08c83cf.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-mx2/devices.h between commit
68c94b40b31926f627573a7f656b903f6644744e ("arm/mx2: use cpp magic to
create spi_imx devices") from the i.MX tree and commit
3f1c5d0f4c64f5e9e4ac329a935b3da67593691f ("USB: MXC: add platform
resources for i.MX21 USB host controller") from the usb 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-mx2/devices.h
index f15df2a,f12694b..0000000
--- a/arch/arm/mach-mx2/devices.h
+++ b/arch/arm/mach-mx2/devices.h
@@@ -34,8 -25,7 +34,9 @@@ extern struct platform_device mxc_usbh1
extern struct platform_device mxc_usbh2;
extern struct platform_device mxc_spi_device0;
extern struct platform_device mxc_spi_device1;
+#ifdef CONFIG_MACH_MX27
extern struct platform_device mxc_spi_device2;
+#endif
+ extern struct platform_device mx21_usbhc_device;
extern struct platform_device imx_ssi_device0;
extern struct platform_device imx_ssi_device1;
next reply other threads:[~2010-02-26 7:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-26 7:10 Stephen Rothwell [this message]
2010-02-26 8:04 ` linux-next: manual merge of the usb tree with the i.MX tree Uwe Kleine-König
2010-02-26 8:09 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-02-26 7:25 Stephen Rothwell
2010-02-26 8:04 ` Uwe Kleine-König
2011-03-04 4:58 Stephen Rothwell
2011-03-04 17:12 ` Greg KH
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=20100226181003.a08c83cf.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mfuzzey@gmail$(echo .)com \
--cc=s.hauer@pengutronix$(echo .)de \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/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