From 4096b240a4f8bffd7479d7cabda6264283e507a0 Mon Sep 17 00:00:00 2001 From: Kenji Kaneshige Date: Tue, 9 Jan 2007 13:02:48 -0800 Subject: [PATCH] --- yaml --- r: 46722 b: refs/heads/master c: 3d9c18872fa1db5c43ab97d8cbca43775998e49c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/Kconfig | 9 --------- trunk/drivers/pci/hotplug/shpchp_core.c | 4 ---- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 1b1d6a8064ea..3a5b5ae826aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34d03419f03bcfdf70d9617a9b90b60c93482c4a +refs/heads/master: 3d9c18872fa1db5c43ab97d8cbca43775998e49c diff --git a/trunk/drivers/pci/hotplug/Kconfig b/trunk/drivers/pci/hotplug/Kconfig index adce4204d87d..be92695a7833 100644 --- a/trunk/drivers/pci/hotplug/Kconfig +++ b/trunk/drivers/pci/hotplug/Kconfig @@ -145,15 +145,6 @@ config HOTPLUG_PCI_SHPC When in doubt, say N. -config HOTPLUG_PCI_SHPC_POLL_EVENT_MODE - bool "Use polling mechanism for hot-plug events (for testing purpose)" - depends on HOTPLUG_PCI_SHPC - help - Say Y here if you want to use the polling mechanism for hot-plug - events for early platform testing. - - When in doubt, say N. - config HOTPLUG_PCI_RPA tristate "RPA PCI Hotplug driver" depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE diff --git a/trunk/drivers/pci/hotplug/shpchp_core.c b/trunk/drivers/pci/hotplug/shpchp_core.c index 590cd3cbe010..5f4bc08a633a 100644 --- a/trunk/drivers/pci/hotplug/shpchp_core.c +++ b/trunk/drivers/pci/hotplug/shpchp_core.c @@ -401,10 +401,6 @@ static int __init shpcd_init(void) { int retval = 0; -#ifdef CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE - shpchp_poll_mode = 1; -#endif - retval = pci_register_driver(&shpc_driver); dbg("%s: pci_register_driver = %d\n", __FUNCTION__, retval); info(DRIVER_DESC " version: " DRIVER_VERSION "\n");