rpms/kernel/devel/configs config-generic, 1.239, 1.240 config-x86-generic, 1.63, 1.64 config-x86_64-generic, 1.50, 1.51

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15241/configs

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
Log Message:
Change some hotplug PCI options.


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- config-generic	4 Aug 2006 21:09:31 -0000	1.239
+++ config-generic	9 Aug 2006 18:43:56 -0000	1.240
@@ -245,9 +245,8 @@
 CONFIG_ISAPNP=y
 # CONFIG_PNPBIOS is not set
 
-# FIXME: Broken in 2.6.18rc1git3
-# CONFIG_HOTPLUG_PCI_ACPI is not set
-# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m 
 
 #
 # Block devices


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- config-x86-generic	15 Jul 2006 06:49:38 -0000	1.63
+++ config-x86-generic	9 Aug 2006 18:43:57 -0000	1.64
@@ -143,7 +143,7 @@
 CONFIG_ACPI_IBM=m
 CONFIG_PNPACPI=y
 CONFIG_ACPI_DOCK=m
-CONFIG_ACPI_IBM_DOCK=y
+# CONFIG_ACPI_IBM_DOCK is not set
 CONFIG_ACPI_SBS=m
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
 # CONFIG_ACPI_HOTKEY is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- config-x86_64-generic	15 Jul 2006 06:49:38 -0000	1.50
+++ config-x86_64-generic	9 Aug 2006 18:43:57 -0000	1.51
@@ -76,7 +76,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
-CONFIG_ACPI_IBM_DOCK=y
+# CONFIG_ACPI_IBM_DOCK is not set
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_SBS=m
@@ -92,7 +92,7 @@
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
-# CONFIG_HOTPLUG_PCI_SHPC is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
 CONFIG_HPET=y