diff options
| author | Luke Yelavich <themuso@ubuntu.com> | 2011-04-01 23:09:37 +1100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-10-17 09:47:59 -0600 |
| commit | 03052b75edc64149a9fa4a44ecddcd0eec25327d (patch) | |
| tree | 21f090c0f4f7fa185ca4b46120623e245a8dce66 | |
| parent | 0daef0970e987cc5b5ff0ef99a94ff0af214ec38 (diff) | |
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>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 1 | ||||
| -rw-r--r-- | debian.master/config/armel/config.common.armel | 1 | ||||
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 1 | ||||
| -rw-r--r-- | debian.master/config/i386/config.common.i386 | 1 | ||||
| -rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 1 | ||||
| -rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 1 |
6 files changed, 5 insertions, 1 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index ba2214aa946..29f59b6ce30 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -70,6 +70,7 @@ CONFIG_DM_SNAPSHOT=y CONFIG_DRM_NOUVEAU=m CONFIG_DRM_PSB=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 f4a9f5d0919..d82843a8a7c 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -53,6 +53,7 @@ CONFIG_DM_SNAPSHOT=y # CONFIG_DRM_NOUVEAU is not set # CONFIG_DRM_PSB 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 d0dd44b2763..13015e6cea2 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1206,7 +1206,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 ce96886e192..19e3cca0e4a 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -69,6 +69,7 @@ CONFIG_DM_SNAPSHOT=y CONFIG_DRM_NOUVEAU=m CONFIG_DRM_PSB=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 7fef6033114..295b0c489de 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -63,6 +63,7 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_PSB is not set 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 cd5beae7261..53cd4574de8 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -68,6 +68,7 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_PSB is not set 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 |