[kernel] r19368 - in dists/sid/linux/debian: . config/i386/none config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Mon Sep  3 01:47:39 2012
New Revision: 19368

Log:
[i386] video: Clean up Geode framebuffer config

- [i386/486] video: Change FB_GEODE_LX from built-in to module (lxfb) (Closes: #686528)
- [i386/686-pae] video: Disable Geode framebuffer drivers, not used with any chips that support PAE

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/i386/none/config.486
   dists/sid/linux/debian/config/kernelarch-x86/config
   dists/sid/linux/debian/config/kernelarch-x86/config-arch-32
   dists/sid/linux/debian/config/kernelarch-x86/config-arch-64

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sun Sep  2 20:54:57 2012	(r19367)
+++ dists/sid/linux/debian/changelog	Mon Sep  3 01:47:39 2012	(r19368)
@@ -106,6 +106,10 @@
     (Closes: #668211)
   * [alpha] Use gcc-4.6 (Closes: #685894)
     - Use large data model to work around link failure
+  * [i386/486] video: Change FB_GEODE_LX from built-in to module (lxfb)
+    (Closes: #686528)
+  * [i386/686-pae] video: Disable Geode framebuffer drivers, not used with
+    any chips that support PAE
 
   [ Bastian Blank ]
   * Make xen-linux-system meta-packages depend on xen-system. This allows

Modified: dists/sid/linux/debian/config/i386/none/config.486
==============================================================================
--- dists/sid/linux/debian/config/i386/none/config.486	Sun Sep  2 20:54:57 2012	(r19367)
+++ dists/sid/linux/debian/config/i386/none/config.486	Mon Sep  3 01:47:39 2012	(r19368)
@@ -136,7 +136,10 @@
 ##
 ## file: drivers/video/geode/Kconfig
 ##
-CONFIG_FB_GEODE_LX=y
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
 
 ##
 ## file: mm/Kconfig

Modified: dists/sid/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-x86/config	Sun Sep  2 20:54:57 2012	(r19367)
+++ dists/sid/linux/debian/config/kernelarch-x86/config	Mon Sep  3 01:47:39 2012	(r19368)
@@ -1503,6 +1503,11 @@
 CONFIG_FONT_8x16=y
 
 ##
+## file: drivers/video/geode/Kconfig
+##
+# CONFIG_FB_GEODE is not set
+
+##
 ## file: drivers/watchdog/Kconfig
 ##
 CONFIG_ACQUIRE_WDT=m

Modified: dists/sid/linux/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-x86/config-arch-32	Sun Sep  2 20:54:57 2012	(r19367)
+++ dists/sid/linux/debian/config/kernelarch-x86/config-arch-32	Mon Sep  3 01:47:39 2012	(r19368)
@@ -477,14 +477,6 @@
 CONFIG_MDA_CONSOLE=m
 
 ##
-## file: drivers/video/geode/Kconfig
-##
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=m
-CONFIG_FB_GEODE_GX=m
-CONFIG_FB_GEODE_GX1=m
-
-##
 ## file: drivers/watchdog/Kconfig
 ##
 CONFIG_SCx200_WDT=m

Modified: dists/sid/linux/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-x86/config-arch-64	Sun Sep  2 20:54:57 2012	(r19367)
+++ dists/sid/linux/debian/config/kernelarch-x86/config-arch-64	Mon Sep  3 01:47:39 2012	(r19368)
@@ -102,11 +102,6 @@
 # CONFIG_FB_SAVAGE_I2C is not set
 
 ##
-## file: drivers/video/geode/Kconfig
-##
-# CONFIG_FB_GEODE is not set
-
-##
 ## file: init/Kconfig
 ##
 CONFIG_RCU_FANOUT=64