From 9078c0ce331cc58344c07c04ce52cc2b4b79d31d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 24 Sep 2014 03:36:38 +0000 Subject: [PATCH] [powerpc/powerpc64,ppc64*] video/fb: Change FB_MATROX, FB_RADEON, FB_ATY, FB_SIS, FB_3DFX, FB_VOODOO1 back to modules (Closes: #748398) svn path=/dists/sid/linux/; revision=21899 --- debian/changelog | 2 ++ debian/config/kernelarch-powerpc/config | 13 +++++-------- debian/config/kernelarch-powerpc/config-arch-64 | 1 - debian/config/powerpc/config.powerpc | 8 ++++++++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index fc96cf6b8..7997959ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ linux (3.16.3-3) UNRELEASED; urgency=low [ 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 Sun, 21 Sep 2014 12:09:24 +0100 diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config index a70cb0d50..92d5e98bf 100644 --- a/debian/config/kernelarch-powerpc/config +++ b/debian/config/kernelarch-powerpc/config @@ -808,34 +808,31 @@ CONFIG_FB_CIRRUS=m # 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 diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64 index c10c09477..1e8c5f7cf 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64 +++ b/debian/config/kernelarch-powerpc/config-arch-64 @@ -119,7 +119,6 @@ CONFIG_HVCS=m # 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 diff --git a/debian/config/powerpc/config.powerpc b/debian/config/powerpc/config.powerpc index 5d48b574d..c5897951c 100644 --- a/debian/config/powerpc/config.powerpc +++ b/debian/config/powerpc/config.powerpc @@ -88,7 +88,15 @@ CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 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