From: "Guan Xuetao" <gxt@mprc•pku.edu.cn>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>,
'Xuetao Guan' <epip.guan@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Sascha Hauer' <s.hauer@pengutronix•de>
Subject: RE: linux-next: manual merge of the unicore32 tree with the i.MX tree
Date: Thu, 3 Mar 2011 16:33:08 +0800 [thread overview]
Message-ID: <021601cbd97d$a0cefc10$e26cf430$@mprc.pku.edu.cn> (raw)
In-Reply-To: <20110303115210.b0e8786b.sfr@canb.auug.org.au>
> -----Original Message-----
> From: linux-next-owner@vger•kernel.org [mailto:linux-next-owner@vger•kernel.org] On Behalf Of Stephen Rothwell
> Sent: Thursday, March 03, 2011 8:52 AM
> To: Xuetao Guan
> Cc: linux-next@vger•kernel.org; linux-kernel@vger•kernel.org; GuanXuetao; Sascha Hauer
> Subject: linux-next: manual merge of the unicore32 tree with the i.MX tree
>
> Hi Xuetao,
>
> Today's linux-next merge of the unicore32 tree got a conflict in
> drivers/video/Kconfig between commit
> 657df5cdfd525648a04b3db69eaa1ba8eb1baf87 ("video: Add i.MX23/28
> framebuffer driver") from the i.MX tree and commit
> a336d8ba89b5afe129cb9178f26216b22d6beb63 ("unicore32 machine related: add
> frame buffer driver for pkunity-v3 soc") from the unicore32 tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks.
It looks good to me.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc drivers/video/Kconfig
> index 8a2f8cf,ec55a87..0000000
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@@ -2320,15 -2365,17 +2320,26 @@@ config FB_JZ474
> help
> Framebuffer support for the JZ4740 SoC.
>
> +config FB_MXS
> + tristate "MXS LCD framebuffer support"
> + depends on FB && ARCH_MXS
> + select FB_CFB_FILLRECT
> + select FB_CFB_COPYAREA
> + select FB_CFB_IMAGEBLIT
> + help
> + Framebuffer support for the MXS SoC.
> +
> + config FB_PUV3_UNIGFX
> + tristate "PKUnity v3 Unigfx framebuffer support"
> + depends on FB && UNICORE32 && ARCH_PUV3
> + select FB_SYS_FILLRECT
> + select FB_SYS_COPYAREA
> + select FB_SYS_IMAGEBLIT
> + select FB_SYS_FOPS
> + help
> + Choose this option if you want to use the Unigfx device as a
> + framebuffer device. Without the support of PCI & AGP.
> +
> source "drivers/video/omap/Kconfig"
> source "drivers/video/omap2/Kconfig"
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger•kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2011-03-03 8:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-03 0:52 linux-next: manual merge of the unicore32 tree with the i.MX tree Stephen Rothwell
2011-03-03 8:33 ` Guan Xuetao [this message]
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='021601cbd97d$a0cefc10$e26cf430$@mprc.pku.edu.cn' \
--to=gxt@mprc$(echo .)pku.edu.cn \
--cc=epip.guan@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=s.hauer@pengutronix$(echo .)de \
--cc=sfr@canb$(echo .)auug.org.au \
/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