[linux] 01/02: [arm64] video: Change FB from module to built-in

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Tue Jan 24 05:23:10 UTC 2017 

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit b30786ada72ac3314185d962611a0fb8a9eb76c1
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Jan 24 05:17:09 2017 +0000

    [arm64] video: Change FB from module to built-in
    
    Currently we don't explicitly set CONFIG_FB for arm64, and the only
    reason it's enabled as a module is that the DRM drivers (which are
    built as modules) select it.  We *do* explicitly set CONFIG_FB=y on
    almost all other architectures and flavours.
    
    Simplify this by setting CONFIG_FB=y at the top level and overriding
    where needed (not arm64).
---
 debian/changelog                        | 1 +
 debian/config/alpha/config              | 1 -
 debian/config/armhf/config              | 1 -
 debian/config/config                    | 1 +
 debian/config/hppa/config               | 1 -
 debian/config/kernelarch-mips/config    | 5 -----
 debian/config/kernelarch-powerpc/config | 1 -
 debian/config/kernelarch-sparc/config   | 1 -
 debian/config/kernelarch-x86/config     | 1 -
 debian/config/m68k/config               | 1 -
 debian/config/s390x/config              | 5 +++++
 debian/config/sh4/config.sh7751r        | 1 -
 debian/config/sh4/config.sh7785lcr      | 1 -
 13 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6471398..8dd8572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -357,6 +357,7 @@ linux (4.9.5-1) UNRELEASED; urgency=medium
   * [x86] ASoC: Intel: select DW_DMAC_CORE since it's mandatory
   * [x86] sound/soc/intel: Enable SND_SOC_INTEL_BDW_RT5677_MACH as module
     (Closes: #851916)
+  * [arm64] video/fbdev: Change FB from module to built-in
 
   [ Salvatore Bonaccorso ]
   * tmpfs: clear S_ISGID when setting posix ACLs (CVE-2017-5551)
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 144e307..b6c850c 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -878,7 +878,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=m
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_CIRRUS=m
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 5512b03..40ccc0b 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -1182,7 +1182,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_FB_VT8500=y
 CONFIG_FB_WM8505=y
diff --git a/debian/config/config b/debian/config/config
index 9dabf1f..c0d954d 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4866,6 +4866,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
+CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_ARC=m
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index dafc021..c973504 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -521,7 +521,6 @@ CONFIG_STI_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_CIRRUS is not set
diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config
index 78b9267..3ea9718 100644
--- a/debian/config/kernelarch-mips/config
+++ b/debian/config/kernelarch-mips/config
@@ -56,11 +56,6 @@ CONFIG_USB_OHCI_HCD=m
 CONFIG_FRAMEBUFFER_CONSOLE=y
 
 ##
-## file: drivers/video/fbdev/Kconfig
-##
-CONFIG_FB=y
-
-##
 ## file: init/Kconfig
 ##
 CONFIG_SGETMASK_SYSCALL=y
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index d78f469..db8641c 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -794,7 +794,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_CIRRUS=m
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index 7f2e07d..0ca9d15 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -472,7 +472,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_CIRRUS is not set
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 04c4037..eb14e6a 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1758,7 +1758,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_CIRRUS=m
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 6e53eb3..dda72de 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -563,7 +563,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_FOREIGN_ENDIAN=y
 ## choice: Choice endianness support
diff --git a/debian/config/s390x/config b/debian/config/s390x/config
index cff53f9..efcda66 100644
--- a/debian/config/s390x/config
+++ b/debian/config/s390x/config
@@ -161,6 +161,11 @@ CONFIG_ZFCP=m
 CONFIG_HVC_IUCV=y
 
 ##
+## file: drivers/video/fbdev/Kconfig
+##
+# CONFIG_FB is not set
+
+##
 ## file: drivers/watchdog/Kconfig
 ##
 CONFIG_DIAG288_WATCHDOG=m
diff --git a/debian/config/sh4/config.sh7751r b/debian/config/sh4/config.sh7751r
index c17f681..7ddd7a7 100644
--- a/debian/config/sh4/config.sh7751r
+++ b/debian/config/sh4/config.sh7751r
@@ -162,7 +162,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_SM501=y
 
 ##
diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr
index c4fa1f5..d26ade6 100644
--- a/debian/config/sh4/config.sh7785lcr
+++ b/debian/config/sh4/config.sh7785lcr
@@ -207,7 +207,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_SM501=y
 
 ##

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git

More information about the Kernel-svn-changes mailing list