Re: linux-next: manual merge of the tip tree with the omap_dss2 tree

[Stephen Rothwell]

H all,

On Tue, 4 Mar 2014 16:13:20 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the tip tree got conflicts in
> drivers/video/Kconfig, drivers/video/Makefile and drivers/video/sgivwfb.c
> between commit 08667731d1d4 ("video: move fbdev to drivers/video/fbdev")
> from the omap_dss2 tree and commit c5f9ee3d665a ("x86, platforms: Remove
> SGI Visual Workstation") from the tip tree.
> 
> I removed drivers/video/fbdev/sgivwfb.c and added the following merge
> fix patch and can carry the fix as necessary (no action is required).

This resolution is now needed when the omap_dss2 tree is merged with
Linus' tree.

> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Tue, 4 Mar 2014 16:11:12 +1100
> Subject: [PATCH] video: fbdev: fix up fro removal of SGI Visual Workstation
> 
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  drivers/video/fbdev/Kconfig  | 11 +----------
>  drivers/video/fbdev/Makefile |  1 -
>  2 files changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
> index 31c3f3ddfd38..6b1984c7f4e7 100644
> --- a/drivers/video/fbdev/Kconfig
> +++ b/drivers/video/fbdev/Kconfig
> @@ -765,18 +765,9 @@ config FB_HGA
>  	  As this card technology is at least 25 years old,
>  	  most people will answer N here.
>  
> -config FB_SGIVW
> -	tristate "SGI Visual Workstation framebuffer support"
> -	depends on FB && X86_VISWS
> -	select FB_CFB_FILLRECT
> -	select FB_CFB_COPYAREA
> -	select FB_CFB_IMAGEBLIT
> -	help
> -	  SGI Visual Workstation support for framebuffer graphics.
> -
>  config FB_GBE
>  	bool "SGI Graphics Backend frame buffer support"
> -	depends on (FB = y) && (SGI_IP32 || X86_VISWS)
> +	depends on (FB = y) && SGI_IP32
>  	select FB_CFB_FILLRECT
>  	select FB_CFB_COPYAREA
>  	select FB_CFB_IMAGEBLIT
> diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile
> index 6ef2c66110e3..0284f2a12538 100644
> --- a/drivers/video/fbdev/Makefile
> +++ b/drivers/video/fbdev/Makefile
> @@ -55,7 +55,6 @@ obj-$(CONFIG_FB_CG14)             += cg14.o sbuslib.o
>  obj-$(CONFIG_FB_P9100)            += p9100.o sbuslib.o
>  obj-$(CONFIG_FB_TCX)              += tcx.o sbuslib.o
>  obj-$(CONFIG_FB_LEO)              += leo.o sbuslib.o
> -obj-$(CONFIG_FB_SGIVW)            += sgivwfb.o
>  obj-$(CONFIG_FB_ACORN)            += acornfb.o
>  obj-$(CONFIG_FB_ATARI)            += atafb.o c2p_iplan2.o atafb_mfb.o \
>                                       atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpWXA1kTFCwA.pgp
Description: PGP signature