[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
This commit is contained in:
Ben Hutchings 2014-09-24 03:36:38 +00:00
parent 86de99e205
commit 9078c0ce33
4 changed files with 15 additions and 9 deletions

2
debian/changelog vendored
View File

@ -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 <ijc@debian.org> Sun, 21 Sep 2014 12:09:24 +0100

View File

@ -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

View File

@ -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

View File

@ -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