[kernel] r11690 - in dists/trunk/linux-2.6/debian: . config/amd64 config/arm config/i386

[Maximilian Attems]

Author: maks
Date: Mon Jun 23 14:05:00 2008
New Revision: 11690

Log:
x86: enable modular FB_UVESA

module not autoloaded, said to coexist with vesafb
give users the playground..

nuke dup disabling in arm, topconfig disabled.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/arm/config.versatile
   dists/trunk/linux-2.6/debian/config/i386/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jun 23 14:05:00 2008
@@ -49,6 +49,7 @@
   * [ppc]: Set SND_VIRMIDI. (closes: #290090)
   * Fallback for userspace compatibility to old IEEE 1394 FireWire stack.
     (closes: #475295, #478419)
+  * [x86]: Enable modular FB_UVESA. (closes: #473180)
 
   [ Martin Michlmayr ]
   * [arm/orion5x] Update the config to reflect upstream renaming this

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Mon Jun 23 14:05:00 2008
@@ -1287,6 +1287,7 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
 CONFIG_FB_VESA=y
 CONFIG_FB_EFI=y
 # CONFIG_FB_IMAC is not set

Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.versatile	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.versatile	Mon Jun 23 14:05:00 2008
@@ -995,7 +995,6 @@
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_UVESA is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Mon Jun 23 14:05:00 2008
@@ -1533,6 +1533,7 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
 CONFIG_FB_VESA=y
 CONFIG_FB_EFI=y
 # CONFIG_FB_IMAC is not set