git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'r8169-upstream-20061204-00' of git://electric-eye.fr.zoreil.com/home/romie...
[sfrench/cifs-2.6.git]
/
drivers
/
pci
/
hotplug
/
shpchp_core.c
diff --git
a/drivers/pci/hotplug/shpchp_core.c
b/drivers/pci/hotplug/shpchp_core.c
index 235c18a22393d04e0ba86ec5f511d086149f6d75..4eac85b3d90e0a91f449101cf6aed4f1338238be 100644
(file)
--- a/
drivers/pci/hotplug/shpchp_core.c
+++ b/
drivers/pci/hotplug/shpchp_core.c
@@
-159,7
+159,7
@@
static int init_slots(struct controller *ctrl)
goto error_info;
slot->number = sun;
- INIT_
WORK(&slot->work, queue_pushbutton_work, slot
);
+ INIT_
DELAYED_WORK(&slot->work, queue_pushbutton_work
);
/* register this slot with the hotplug pci core */
hotplug_slot->private = slot;