rpms/kernel/F-11 config-generic, 1.279, 1.280 config-powerpc-generic, 1.39, 1.40 kernel.spec, 1.1586, 1.1587

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31031

Modified Files:
	config-generic config-powerpc-generic kernel.spec 
Log Message:
* Mon May 04 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.2-125
- Disable CONFIG_FB_NVIDIA due to very bad interactions with nouveau





Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- config-generic	1 May 2009 20:40:05 -0000	1.279
+++ config-generic	4 May 2009 07:54:51 -0000	1.280
@@ -2411,9 +2411,7 @@ CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_NVIDIA=m
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 # CONFIG_FB_PM3 is not set
@@ -3382,7 +3380,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_FB_NVIDIA_BACKLIGHT=y
 CONFIG_FB_RIVA_BACKLIGHT=y
 CONFIG_FB_RADEON_BACKLIGHT=y
 CONFIG_FB_ATY128_BACKLIGHT=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-powerpc-generic,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- config-powerpc-generic	23 Mar 2009 19:21:08 -0000	1.39
+++ config-powerpc-generic	4 May 2009 07:54:51 -0000	1.40
@@ -54,13 +54,12 @@ CONFIG_FB_OF=y
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_MATROX=y
-CONFIG_FB_NVIDIA=y
+# CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y
 CONFIG_FB_RADEON_BACKLIGHT=y
 CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_NVIDIA_BACKLIGHT=y
 
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1586
retrieving revision 1.1587
diff -u -p -r1.1586 -r1.1587
--- kernel.spec	3 May 2009 02:25:35 -0000	1.1586
+++ kernel.spec	4 May 2009 07:54:51 -0000	1.1587
@@ -1967,6 +1967,9 @@ fi
 # and build.
 
 %changelog
+* Mon May 04 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.2-125
+- Disable CONFIG_FB_NVIDIA due to very bad interactions with nouveau
+
 * Sun May 03 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.2-124
 - drm-nouveau.patch: ignore unsupported dcb encoder types completely
 - nv50: module option to run output scripts, too raw to be by default yet,