UBUNTU: [Config] Disable CONFIG_STUB_POULSBO

BugLink: http://bugs.launchpad.net/bugs/899244

There is a staging driver, psb_gfX (CONFIG_DRM_PSB), which supports
Intel GMA500 cards.  This driver has moved out of staging as of v3.3.
We currently have this staging driver enabled.  Unfortunately, this
driver conflicts with the poulsbo driver (CONFIG_STUB_POULSBO). The
poulsbo driver supports cards 8086:8108 and 8086:8109 both of which are
also supported by the psb_gfx driver.  It has been requested we disable
the poulsbo driver in favor of the psb_gfx driver.  Users owning 8086:8108
confirm they need to use the psb_gfx driver to have proper support.  If
they try to use the poulsbo driver, X fails.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/abi/3.2.0-18.29/amd64/generic.modules b/debian.master/abi/3.2.0-18.29/amd64/generic.modules
index f03cb9a..c36497b 100644 (file)
--- a/debian.master/abi/3.2.0-18.29/amd64/generic.modules
+++ b/debian.master/abi/3.2.0-18.29/amd64/generic.modules
@@ -2036,7 +2036,6 @@ pn544
 pn_pep
 pohmelfs
 poseidon
-poulsbo
 powermate
 ppa
 ppdev

diff --git a/debian.master/abi/3.2.0-18.29/i386/generic-pae.modules b/debian.master/abi/3.2.0-18.29/i386/generic-pae.modules
index efd33f8..6cf2bc6 100644 (file)
--- a/debian.master/abi/3.2.0-18.29/i386/generic-pae.modules
+++ b/debian.master/abi/3.2.0-18.29/i386/generic-pae.modules
@@ -2170,7 +2170,6 @@ pn_pep
 poc
 pohmelfs
 poseidon
-poulsbo
 powermate
 ppa
 ppdev

diff --git a/debian.master/abi/3.2.0-18.29/i386/generic.modules b/debian.master/abi/3.2.0-18.29/i386/generic.modules
index 4ec9f85..efd59bc 100644 (file)
--- a/debian.master/abi/3.2.0-18.29/i386/generic.modules
+++ b/debian.master/abi/3.2.0-18.29/i386/generic.modules
@@ -2180,7 +2180,6 @@ pn_pep
 poc
 pohmelfs
 poseidon
-poulsbo
 powermate
 ppa
 ppdev

diff --git a/debian.master/abi/3.2.0-18.29/powerpc/powerpc-smp.modules b/debian.master/abi/3.2.0-18.29/powerpc/powerpc-smp.modules
index 2fcee8b..40a5b82 100644 (file)
--- a/debian.master/abi/3.2.0-18.29/powerpc/powerpc-smp.modules
+++ b/debian.master/abi/3.2.0-18.29/powerpc/powerpc-smp.modules
@@ -1834,7 +1834,6 @@ pn544
 pn_pep
 pohmelfs
 poseidon
-poulsbo
 powermate
 ppa
 ppdev

diff --git a/debian.master/abi/3.2.0-18.29/powerpc/powerpc.modules b/debian.master/abi/3.2.0-18.29/powerpc/powerpc.modules
index cf5534f..46d5c7d 100644 (file)
--- a/debian.master/abi/3.2.0-18.29/powerpc/powerpc.modules
+++ b/debian.master/abi/3.2.0-18.29/powerpc/powerpc.modules
@@ -1833,7 +1833,6 @@ pn544
 pn_pep
 pohmelfs
 poseidon
-poulsbo
 powermate
 ppa
 ppdev

diff --git a/debian.master/abi/3.2.0-18.29/powerpc/powerpc64-smp.modules b/debian.master/abi/3.2.0-18.29/powerpc/powerpc64-smp.modules
index 64127d6..e4a3595 100644 (file)
--- a/debian.master/abi/3.2.0-18.29/powerpc/powerpc64-smp.modules
+++ b/debian.master/abi/3.2.0-18.29/powerpc/powerpc64-smp.modules
@@ -1819,7 +1819,6 @@ pn544
 pn_pep
 pohmelfs
 poseidon
-poulsbo
 powermate
 ppa
 ppdev

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 38eba61..fc9f48a 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5251,7 +5251,7 @@ CONFIG_STOP_MACHINE=y
 CONFIG_STP=m
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_STUB_POULSBO=m
+# CONFIG_STUB_POULSBO is not set
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_SUNGEM=m