UBUNTU: [Config] CONFIG_DRM_NOUVEAU=n for armel FTBS

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 9c46291..12e520d 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -32,6 +32,7 @@ CONFIG_CRYPTO_HMAC=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DISPLAY_SUPPORT=m
 CONFIG_DM_RAID45=m
+CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_RADEON=m
 CONFIG_DT3155=m
 # CONFIG_DVB_FE_CUSTOMISE is not set

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 2839e40..8595fb2 100644 (file)
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -36,6 +36,7 @@ CONFIG_I2C_INTEL_MID=m
 # CONFIG_INTR_REMAP is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_LAPBETHER is not set
+# CONFIG_LINE6_USB is not set
 CONFIG_LZO_COMPRESS=m
 # CONFIG_M686 is not set
 # CONFIG_MFD_JANZ_CMODIO is not set

diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap
index bcf8d9c..4a00d21 100644 (file)
--- a/debian.master/config/armel/config.flavour.omap
+++ b/debian.master/config/armel/config.flavour.omap
@@ -55,7 +55,6 @@ CONFIG_LAPB=m
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LIBERTAS_MESH is not set
-# CONFIG_LINE6_USB is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=17

diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile
index 8804f8e..0bbccef 100644 (file)
--- a/debian.master/config/armel/config.flavour.versatile
+++ b/debian.master/config/armel/config.flavour.versatile
@@ -20,6 +20,7 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_DISPLAY_SUPPORT=m
 CONFIG_DM_RAID45=m
+# CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DVB_FE_CUSTOMISE is not set
 # CONFIG_DVB_USB_EC168 is not set
 CONFIG_FB_ARMCLCD=y
@@ -55,7 +56,6 @@ CONFIG_KSM=y
 CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LIBERTAS_MESH=y
-# CONFIG_LINE6_USB is not set
 CONFIG_LLC=y
 # CONFIG_LLC2 is not set
 CONFIG_LOG_BUF_SHIFT=14

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4877ece..b8a7c8c 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1078,7 +1078,6 @@ CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_MGA=m
-CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU_DEBUG=y
 CONFIG_DRM_R128=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 44046db..577a268 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -32,6 +32,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DISPLAY_SUPPORT=m
 CONFIG_DM_RAID45=m
+CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_RADEON=m
 CONFIG_DT3155=m
 # CONFIG_DVB_FE_CUSTOMISE is not set