rpms/kernel/F-11 config-generic, 1.299, 1.300 kernel.spec, 1.1806, 1.1807

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	config-generic kernel.spec 
Log Message:
Restore some options to their original values:
  CONFIG_PCIEAER_INJECT is not set
  CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
  CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
  CONFIG_USB_STORAGE_CYPRESS_ATACB is not set


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- config-generic	3 Feb 2010 04:12:10 -0000	1.299
+++ config-generic	5 Feb 2010 00:18:40 -0000	1.300
@@ -85,7 +85,7 @@ CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIE_ECRC=y
-CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIEAER_INJECT is not set
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_PCI_LEGACY=y
@@ -2545,7 +2545,7 @@ CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_MPU401=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 
 CONFIG_SND_DRIVERS=y
 
@@ -2610,7 +2610,7 @@ CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_CODEC_NVHDMI=y
 CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HIFIER=m
@@ -2710,7 +2710,7 @@ CONFIG_USB_TMC=m
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 CONFIG_USB_STORAGE_DATAFAB=y
 CONFIG_USB_STORAGE_FREECOM=y
 CONFIG_USB_STORAGE_ISD200=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1806
retrieving revision 1.1807
diff -u -p -r1.1806 -r1.1807
--- kernel.spec	4 Feb 2010 21:06:33 -0000	1.1806
+++ kernel.spec	5 Feb 2010 00:18:40 -0000	1.1807
@@ -2026,13 +2026,20 @@ fi
 # and build.
 
 %changelog
-* Wed Feb 03 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.8-21.rc1
+* Thu Feb 04 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.8-22.rc1
+- Restore some options to their original values:
+  CONFIG_PCIEAER_INJECT is not set
+  CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+  CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+  CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+
+* Thu Feb 04 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.8-21.rc1
 - Fix utrace header. (rhbz#561536)
 - fix-conntrack-bug-with-namespaces.patch: Fix for issue identified by jcm,
   http://lkml.org/lkml/2010/2/3/112
 - Fix another conntrack issue pointed out by jcm.
 
-* Wed Feb 03 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.8-20.rc1
+* Thu Feb 04 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.8-20.rc1
 - Linux 2.6.32.8-rc1
 - Drop patches merged in -stable:
   linux-2.6-userspace_kvmclock_offset.patch