diff options
author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2007-01-09 16:02:48 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 18:50:05 -0500 |
commit | 3d9c18872fa1db5c43ab97d8cbca43775998e49c (patch) | |
tree | 20eb2346e87a5e0df2da945b106a155a87d637da /drivers/pci | |
parent | 34d03419f03bcfdf70d9617a9b90b60c93482c4a (diff) |
shpchp: remove CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE
The CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE config option is not
needed because polling mechanism for shpc hotplug events can be
enabled through module option 'shpchp_poll_mode'. This patch removes
CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/Kconfig | 9 | ||||
-rw-r--r-- | drivers/pci/hotplug/shpchp_core.c | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index adce4204d87d..be92695a7833 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig | |||
@@ -145,15 +145,6 @@ config HOTPLUG_PCI_SHPC | |||
145 | 145 | ||
146 | When in doubt, say N. | 146 | When in doubt, say N. |
147 | 147 | ||
148 | config HOTPLUG_PCI_SHPC_POLL_EVENT_MODE | ||
149 | bool "Use polling mechanism for hot-plug events (for testing purpose)" | ||
150 | depends on HOTPLUG_PCI_SHPC | ||
151 | help | ||
152 | Say Y here if you want to use the polling mechanism for hot-plug | ||
153 | events for early platform testing. | ||
154 | |||
155 | When in doubt, say N. | ||
156 | |||
157 | config HOTPLUG_PCI_RPA | 148 | config HOTPLUG_PCI_RPA |
158 | tristate "RPA PCI Hotplug driver" | 149 | tristate "RPA PCI Hotplug driver" |
159 | depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE | 150 | depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE |
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index 590cd3cbe010..5f4bc08a633a 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c | |||
@@ -401,10 +401,6 @@ static int __init shpcd_init(void) | |||
401 | { | 401 | { |
402 | int retval = 0; | 402 | int retval = 0; |
403 | 403 | ||
404 | #ifdef CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE | ||
405 | shpchp_poll_mode = 1; | ||
406 | #endif | ||
407 | |||
408 | retval = pci_register_driver(&shpc_driver); | 404 | retval = pci_register_driver(&shpc_driver); |
409 | dbg("%s: pci_register_driver = %d\n", __FUNCTION__, retval); | 405 | dbg("%s: pci_register_driver = %d\n", __FUNCTION__, retval); |
410 | info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); | 406 | info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); |