summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-generic4
-rw-r--r--kernel.spec3
2 files changed, 5 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index b1bd9d507..ce303593c 100644
--- a/config-generic
+++ b/config-generic
@@ -2516,7 +2516,7 @@ CONFIG_AGP_VIA=y
CONFIG_AGP_EFFICEON=y
CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_STUB_POULSBO=m
+# CONFIG_STUB_POULSBO is not set
CONFIG_DRM=m
CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
@@ -4460,7 +4460,7 @@ CONFIG_USB_ATMEL=m
# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
# CONFIG_RTS_PSTOR is not set
-# CONFIG_DRM_PSB is not set
+CONFIG_DRM_PSB=m
CONFIG_ALTERA_STAPL=m
# CONFIG_DVB_CXD2099 is not set
# CONFIG_USBIP_CORE is not set
diff --git a/kernel.spec b/kernel.spec
index e5287dd6d..255a90185 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2165,6 +2165,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Dec 02 2011 Dave Jones <davej@redhat.com> 3.2.0-0.rc4.git1.3.fc17
+- Enable Poulsbo DRM.
+
* Fri Dec 02 2011 Dave Jones <davej@redhat.com>
- Linux 3.2-rc4-git1 (5983fe2b29df5885880d7fa3b91aca306c7564ef)
dropped: rtlwifi-fix-lps_lock-deadlock.patch (applied upstream)