git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
cpqphp_ctrl.c
diff --git
a/drivers/pci/hotplug/cpqphp_ctrl.c
b/drivers/pci/hotplug/cpqphp_ctrl.c
index
ae2dd36
..
79ff6b4
100644
(file)
--- a/
drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/
drivers/pci/hotplug/cpqphp_ctrl.c
@@
-36,6
+36,7
@@
#include <linux/wait.h>
#include <linux/smp_lock.h>
#include <linux/pci.h>
#include <linux/wait.h>
#include <linux/smp_lock.h>
#include <linux/pci.h>
+#include <linux/pci_hotplug.h>
#include "cpqphp.h"
static u32 configure_new_device(struct controller* ctrl, struct pci_func *func,
#include "cpqphp.h"
static u32 configure_new_device(struct controller* ctrl, struct pci_func *func,
@@
-889,7
+890,7
@@
int cpqhp_resource_sort_and_combine(struct pci_resource **head)
}
}
-irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data
, struct pt_regs *regs
)
+irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data)
{
struct controller *ctrl = data;
u8 schedule_flag = 0;
{
struct controller *ctrl = data;
u8 schedule_flag = 0;