UBUNTU: [Config] Disable CONFIG_DRM_RADEON_KMS on powerpc kernels

Radeon KMS on powerpc gives an oops on startup, leaving the user with a blank
screen. Disable KMS for now so that machines with radeon hardware will at
least work in the console/X.

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

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index bff2b5b..eee711d 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -68,6 +68,7 @@ CONFIG_DM_RAID45=m
 CONFIG_DM_SNAPSHOT=y
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
 CONFIG_DT3155=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 80f2921..9202d76 100644 (file)
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -51,6 +51,7 @@ CONFIG_DM_MULTIPATH=y
 CONFIG_DM_SNAPSHOT=y
 # CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DRM_RADEON is not set
+CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DT3155 is not set
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 CONFIG_ECHO=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ddba078..d82e93d 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1194,7 +1194,6 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU_DEBUG=y
 CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON_KMS=y
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_TDFX=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 26fba1c..75ff0b4 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -67,6 +67,7 @@ CONFIG_DM_RAID45=m
 CONFIG_DM_SNAPSHOT=y
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
 CONFIG_DT3155=m
 # CONFIG_DVB_FE_CUSTOMISE is not set
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 1b901f4..a3723f9 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -61,6 +61,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_KMS is not set
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 # CONFIG_DVB_USB_EC168 is not set

diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 4914ef9..b1dcede 100644 (file)
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -66,6 +66,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 # CONFIG_DVB_USB_EC168 is not set