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,
Lukasz Majewski <l.majewski@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Kukjin Kim <kgene.kim@samsung.com>
Subject: linux-next: manual merge of the usb tree with the s5p tree
Date: Fri, 18 May 2012 17:22:24 +1000 [thread overview]
Message-ID: <20120518172224.abd97797bab5d99eaeec97a5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-exynos/mach-universal_c210.c between commit 6dafa4aead1b
("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
from the s5p tree and commit 3a36dd068f43 ("ARM: EXYNOS: Add s3c-hsotg
device support for Universal C210 board") from the usb tree.
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-exynos/mach-universal_c210.c
index dd8ec8d4,9be8a07..0000000
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@@ -23,7 -23,7 +23,8 @@@
#include <linux/i2c-gpio.h>
#include <linux/i2c/mcs.h>
#include <linux/i2c/atmel_mxt_ts.h>
+#include <drm/exynos_drm.h>
+ #include <linux/platform_data/s3c-hsotg.h>
#include <asm/mach/arch.h>
#include <asm/hardware/gic.h>
@@@ -1076,9 -1058,7 +1085,10 @@@ static struct platform_device *universa
&s5p_device_onenand,
&s5p_device_fimd0,
&s5p_device_jpeg,
+#ifdef CONFIG_DRM_EXYNOS
+ &exynos_device_drm,
+#endif
+ &s3c_device_usb_hsotg,
&s5p_device_mfc,
&s5p_device_mfc_l,
&s5p_device_mfc_r,
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-05-18 7:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 7:22 Stephen Rothwell [this message]
2012-05-18 15:21 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2012-05-16 8:03 Stephen Rothwell
2012-05-16 12:06 ` Greg KH
2012-05-14 7:47 Stephen Rothwell
2012-05-14 14:28 ` Greg KH
2011-04-14 4:15 Stephen Rothwell
2011-04-14 4:52 ` Greg KH
2011-03-11 6:09 Stephen Rothwell
2011-03-11 6:39 ` Lars-Peter Clausen
2011-03-11 7:19 ` Kukjin Kim
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=20120518172224.abd97797bab5d99eaeec97a5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=kgene.kim@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=l.majewski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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
all inboxes | Powered by JetHome®