UBUNTU: [Config] Build some framebuffer drivers as modules for powerpc kernels.

At some point in the past with config update/consolidation, some framebuffer
drivers got built into the powerpc kernels. This config change builds these
drivers as modules, as the OpenFirmware framebuffer driver is already in the
kernel. This also allows DRM modules to take priority in the case of radeon
cards.

Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index a3723f9..4d341ee 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -71,14 +71,10 @@ CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 # CONFIG_ET131X is not set
 # CONFIG_EZX_PCAP is not set
 CONFIG_FB_3DFX=y
-CONFIG_FB_ATY=y
-CONFIG_FB_ATY128=y
 CONFIG_FB_BACKLIGHT=y
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_DDC=y
 CONFIG_FB_MACMODES=y
-CONFIG_FB_MATROX=y
-CONFIG_FB_RADEON=y
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SVGALIB=m

diff --git a/debian.master/config/powerpc/config.flavour.powerpc b/debian.master/config/powerpc/config.flavour.powerpc
index 69a821c..01a6ba9 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc
+++ b/debian.master/config/powerpc/config.flavour.powerpc
@@ -8,6 +8,10 @@
 # CONFIG_CFG80211_REG_DEBUG is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_CRYPTO_LZO=m
+CONFIG_FB_ATY=y
+CONFIG_FB_ATY128=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_RADEON=m
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
index f84bc80..b7e4153 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
@@ -8,6 +8,10 @@
 CONFIG_CFG80211_REG_DEBUG=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_CRYPTO_LZO=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY128=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_RADEON=m
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m

diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-smp b/debian.master/config/powerpc/config.flavour.powerpc64-smp
index 89d3151..d053865 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc64-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc64-smp
@@ -8,6 +8,10 @@ CONFIG_ATA_NONSTANDARD=y
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CRASH_DUMP=y
 CONFIG_CRYPTO_LZO=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY128=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_RADEON=m
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_FOPS=y