time: fold __get_realtime_clock_ts() into getnstimeofday()

[linux-2.6-omap-h63xx.git] / drivers / pci / hotplug / shpchp_core.c

diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index 590cd3cbe0104fd8a3e1eba2a70f28aa8d3e9260..80dec9796b3131161c8c4302a8e0b8eee7e7f8b3 100644 (file)
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -136,7 +136,7 @@ static int init_slots(struct controller *ctrl)
                slot->hpc_ops = ctrl->hpc_ops;
                slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i);
                mutex_init(&slot->lock);
-               INIT_DELAYED_WORK(&slot->work, queue_pushbutton_work);
+               INIT_DELAYED_WORK(&slot->work, shpchp_queue_pushbutton_work);
 
                /* register this slot with the hotplug pci core */
                hotplug_slot->private = slot;
@@ -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");