diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/pci/hotplug/cpqphp_ctrl.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/pci/hotplug/cpqphp_ctrl.c')
| -rw-r--r-- | drivers/pci/hotplug/cpqphp_ctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c index ae2dd36efef2..3ec2ad7db49a 100644 --- a/drivers/pci/hotplug/cpqphp_ctrl.c +++ b/drivers/pci/hotplug/cpqphp_ctrl.c | |||
| @@ -889,7 +889,7 @@ int cpqhp_resource_sort_and_combine(struct pci_resource **head) | |||
| 889 | } | 889 | } |
| 890 | 890 | ||
| 891 | 891 | ||
| 892 | irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data, struct pt_regs *regs) | 892 | irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data) |
| 893 | { | 893 | { |
| 894 | struct controller *ctrl = data; | 894 | struct controller *ctrl = data; |
| 895 | u8 schedule_flag = 0; | 895 | u8 schedule_flag = 0; |