From bacdb82917ff6eb6705c21678f0af71a12ad1496 Mon Sep 17 00:00:00 2001 From: Kenji Kaneshige Date: Thu, 9 Aug 2007 16:09:30 -0700 Subject: [PATCH] --- yaml --- r: 68011 b: refs/heads/master c: 89913bf77a60fdb6ff204a670d3e191848a7b2c8 h: refs/heads/master i: 68009: 22adce42c10dbd5a736beefef9d9899d65f1fa93 68007: f96ad299e542afc6f8c5600851baed0389d9c6f2 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/pciehp_core.c | 4 ---- trunk/drivers/pci/pcie/Kconfig | 9 --------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index c5829341ac67..227f5f86fbb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73a985a140cd0f1b17fa1438af0359d6b9b32b16 +refs/heads/master: 89913bf77a60fdb6ff204a670d3e191848a7b2c8 diff --git a/trunk/drivers/pci/hotplug/pciehp_core.c b/trunk/drivers/pci/hotplug/pciehp_core.c index e5d3f0b4f45a..3d692a971218 100644 --- a/trunk/drivers/pci/hotplug/pciehp_core.c +++ b/trunk/drivers/pci/hotplug/pciehp_core.c @@ -540,10 +540,6 @@ static int __init pcied_init(void) { int retval = 0; -#ifdef CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE - pciehp_poll_mode = 1; -#endif - retval = pcie_port_service_register(&hpdriver_portdrv); dbg("pcie_port_service_register = %d\n", retval); info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); diff --git a/trunk/drivers/pci/pcie/Kconfig b/trunk/drivers/pci/pcie/Kconfig index 0ad92a8ad8b1..287a9311716c 100644 --- a/trunk/drivers/pci/pcie/Kconfig +++ b/trunk/drivers/pci/pcie/Kconfig @@ -25,13 +25,4 @@ config HOTPLUG_PCI_PCIE When in doubt, say N. -config HOTPLUG_PCI_PCIE_POLL_EVENT_MODE - bool "Use polling mechanism for hot-plug events (for testing purpose)" - depends on HOTPLUG_PCI_PCIE - 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. - source "drivers/pci/pcie/aer/Kconfig"