[linux] 03/07: [mips*] Move FRAMEBUFFER_CONSOLE, FB to per-kernel-arch config

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit 9873448a4ddda0e94b92f54b2094b780a799f4e0
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon May 23 12:49:26 2016 +0100

    [mips*] Move FRAMEBUFFER_CONSOLE, FB to per-kernel-arch config
    
    This only needs to be overridden for octeon.
---
 debian/config/kernelarch-mips/config             | 6 ++++++
 debian/config/kernelarch-mips/config.4kc-malta   | 6 ------
 debian/config/kernelarch-mips/config.5kc-malta   | 6 ------
 debian/config/kernelarch-mips/config.loongson-2e | 6 ------
 debian/config/kernelarch-mips/config.loongson-2f | 6 ------
 debian/config/kernelarch-mips/config.octeon      | 5 +++++
 6 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config
index d8f9ea8..e919f38 100644
--- a/debian/config/kernelarch-mips/config
+++ b/debian/config/kernelarch-mips/config
@@ -51,6 +51,12 @@ CONFIG_USB_OHCI_HCD=m
 ## file: drivers/video/console/Kconfig
 ##
 # CONFIG_VGA_CONSOLE is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
+
+##
+## file: drivers/video/fbdev/Kconfig
+##
+CONFIG_FB=y
 
 ##
 ## file: init/Kconfig
diff --git a/debian/config/kernelarch-mips/config.4kc-malta b/debian/config/kernelarch-mips/config.4kc-malta
index 01b2e8e..ed47c42 100644
--- a/debian/config/kernelarch-mips/config.4kc-malta
+++ b/debian/config/kernelarch-mips/config.4kc-malta
@@ -410,14 +410,8 @@ CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_SL811_HCD=m
 
 ##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
-##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_CIRRUS=y
diff --git a/debian/config/kernelarch-mips/config.5kc-malta b/debian/config/kernelarch-mips/config.5kc-malta
index 4992d8e..9714b82 100644
--- a/debian/config/kernelarch-mips/config.5kc-malta
+++ b/debian/config/kernelarch-mips/config.5kc-malta
@@ -410,14 +410,8 @@ CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_SL811_HCD=m
 
 ##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
-##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_CIRRUS=y
diff --git a/debian/config/kernelarch-mips/config.loongson-2e b/debian/config/kernelarch-mips/config.loongson-2e
index 2e385df..42c942f 100644
--- a/debian/config/kernelarch-mips/config.loongson-2e
+++ b/debian/config/kernelarch-mips/config.loongson-2e
@@ -99,13 +99,7 @@ CONFIG_LCD_PLATFORM=y
 CONFIG_BACKLIGHT_GENERIC=m
 
 ##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
-##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_RADEON=y
 
diff --git a/debian/config/kernelarch-mips/config.loongson-2f b/debian/config/kernelarch-mips/config.loongson-2f
index 44db431..79e22f3 100644
--- a/debian/config/kernelarch-mips/config.loongson-2f
+++ b/debian/config/kernelarch-mips/config.loongson-2f
@@ -121,14 +121,8 @@ CONFIG_LCD_PLATFORM=y
 CONFIG_BACKLIGHT_GENERIC=m
 
 ##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
-##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_SIS=y
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index e6578da..9f500a2 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -165,6 +165,11 @@ CONFIG_USB_OCTEON_EHCI=y
 CONFIG_USB_OCTEON_OHCI=y
 
 ##
+## file: drivers/video/fbdev/Kconfig
+##
+# CONFIG_FB is not set
+
+##
 ## file: kernel/power/Kconfig
 ##
 # CONFIG_SUSPEND is not set

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