diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/pci/hotplug/cpqphp.h | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/pci/hotplug/cpqphp.h')
| -rw-r--r-- | drivers/pci/hotplug/cpqphp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/cpqphp.h b/drivers/pci/hotplug/cpqphp.h index c74e9e37e76b..ea040c32f47d 100644 --- a/drivers/pci/hotplug/cpqphp.h +++ b/drivers/pci/hotplug/cpqphp.h | |||
| @@ -409,7 +409,7 @@ extern void cpqhp_remove_debugfs_files (struct controller *ctrl); | |||
| 409 | 409 | ||
| 410 | /* controller functions */ | 410 | /* controller functions */ |
| 411 | extern void cpqhp_pushbutton_thread (unsigned long event_pointer); | 411 | extern void cpqhp_pushbutton_thread (unsigned long event_pointer); |
| 412 | extern irqreturn_t cpqhp_ctrl_intr (int IRQ, void *data, struct pt_regs *regs); | 412 | extern irqreturn_t cpqhp_ctrl_intr (int IRQ, void *data); |
| 413 | extern int cpqhp_find_available_resources (struct controller *ctrl, void __iomem *rom_start); | 413 | extern int cpqhp_find_available_resources (struct controller *ctrl, void __iomem *rom_start); |
| 414 | extern int cpqhp_event_start_thread (void); | 414 | extern int cpqhp_event_start_thread (void); |
| 415 | extern void cpqhp_event_stop_thread (void); | 415 | extern void cpqhp_event_stop_thread (void); |