[kernel] r21899 - in dists/sid/linux/debian: . config/kernelarch-powerpc config/powerpc

[Ben Hutchings]

Author: benh
Date: Wed Sep 24 03:36:38 2014
New Revision: 21899

Log:
[powerpc/powerpc64,ppc64*] video/fb: Change FB_MATROX, FB_RADEON, FB_ATY, FB_SIS, FB_3DFX, FB_VOODOO1 back to modules (Closes: #748398)

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/kernelarch-powerpc/config
   dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64
   dists/sid/linux/debian/config/powerpc/config.powerpc

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Wed Sep 24 02:35:12 2014	(r21898)
+++ dists/sid/linux/debian/changelog	Wed Sep 24 03:36:38 2014	(r21899)
@@ -5,6 +5,8 @@
 
   [ Ben Hutchings ]
   * [hppa/parisc64-smp] Work around gcc 4.8 miscompilation (Closes: #762390)
+  * [powerpc/powerpc64,ppc64*] video/fb: Change FB_MATROX, FB_RADEON, FB_ATY,
+    FB_SIS, FB_3DFX, FB_VOODOO1 back to modules (Closes: #748398)
 
  -- Ian Campbell <ijc at debian.org>  Sun, 21 Sep 2014 12:09:24 +0100
 

Modified: dists/sid/linux/debian/config/kernelarch-powerpc/config
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-powerpc/config	Wed Sep 24 02:35:12 2014	(r21898)
+++ dists/sid/linux/debian/config/kernelarch-powerpc/config	Wed Sep 24 03:36:38 2014	(r21899)
@@ -808,34 +808,31 @@
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
 CONFIG_FB_OF=y
-CONFIG_FB_CT65550=y
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_S1D13XXX=m
-CONFIG_FB_MATROX=y
+CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=y
+CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=y
-CONFIG_FB_ATY=y
+CONFIG_FB_ATY=m
 CONFIG_FB_ATY_CT=y
 CONFIG_FB_ATY_GENERIC_LCD=y
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SAVAGE_I2C=y
 CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=y
+CONFIG_FB_SIS=m
 CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=y
-CONFIG_FB_VOODOO1=y
+CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 CONFIG_FB_IBM_GXT4500=m
 # CONFIG_FB_VIRTUAL is not set

Modified: dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64	Wed Sep 24 02:35:12 2014	(r21898)
+++ dists/sid/linux/debian/config/kernelarch-powerpc/config-arch-64	Wed Sep 24 03:36:38 2014	(r21899)
@@ -119,7 +119,6 @@
 # CONFIG_FB_PLATINUM is not set
 # CONFIG_FB_VALKYRIE is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_ATY128 is not set
 
 ##
 ## file: drivers/watchdog/Kconfig

Modified: dists/sid/linux/debian/config/powerpc/config.powerpc
==============================================================================
--- dists/sid/linux/debian/config/powerpc/config.powerpc	Wed Sep 24 02:35:12 2014	(r21898)
+++ dists/sid/linux/debian/config/powerpc/config.powerpc	Wed Sep 24 03:36:38 2014	(r21899)
@@ -88,7 +88,15 @@
 CONFIG_FB_CONTROL=y
 CONFIG_FB_PLATINUM=y
 CONFIG_FB_VALKYRIE=y
+CONFIG_FB_CT65550=y
 CONFIG_FB_IMSTT=y
+CONFIG_FB_MATROX=y
+CONFIG_FB_RADEON=y
+CONFIG_FB_ATY128=y
+CONFIG_FB_ATY=y
+CONFIG_FB_SIS=y
+CONFIG_FB_3DFX=y
+CONFIG_FB_VOODOO1=y
 
 ##
 ## file: init/Kconfig