Re: [GIT PULL] fbdev reorder for 3.15
From: Stephen Rothwell <hidden>
Date: 2014-04-09 23:05:04
Also in:
lkml
Subsystem:
framebuffer layer, the rest · Maintainers:
Helge Deller, Linus Torvalds
Hi Linus, On Wed, 9 Apr 2014 12:23:47 -0700 Linus Torvalds [off-list ref] wrote:
Are there other things pending in this area? Because if there are, I think I'll take you up on your "or we can rebase on top of -rc1" offer instead.
I have only 2 other commits that touch drivers/video in linux-next and they are both from Tomi and both only touch a couple of files in drivers/video/omap2/dss (and drivers/video/fbdev/omap2/dss/ since one of them is based after the move). I also have the following merge fix patch in linux-next (maybe you already have this in the test merge branches): From: Stephen Rothwell <redacted> Date: Tue, 4 Mar 2014 16:11:12 +1100 Subject: [PATCH] video: fbdev: fix up for removal of SGI Visual Workstation Signed-off-by: Stephen Rothwell <redacted> --- 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
--
1.9.0
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.auAttachments
- (unnamed) [application/pgp-signature] 836 bytes