diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /drivers/infiniband/hw/ehca/ehca_irq.h | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'drivers/infiniband/hw/ehca/ehca_irq.h')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ehca_irq.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.h b/drivers/infiniband/hw/ehca/ehca_irq.h index be579cc0adf6..6ed06ee033ed 100644 --- a/drivers/infiniband/hw/ehca/ehca_irq.h +++ b/drivers/infiniband/hw/ehca/ehca_irq.h | |||
| @@ -56,6 +56,7 @@ void ehca_tasklet_neq(unsigned long data); | |||
| 56 | 56 | ||
| 57 | irqreturn_t ehca_interrupt_eq(int irq, void *dev_id); | 57 | irqreturn_t ehca_interrupt_eq(int irq, void *dev_id); |
| 58 | void ehca_tasklet_eq(unsigned long data); | 58 | void ehca_tasklet_eq(unsigned long data); |
| 59 | void ehca_process_eq(struct ehca_shca *shca, int is_irq); | ||
| 59 | 60 | ||
| 60 | struct ehca_cpu_comp_task { | 61 | struct ehca_cpu_comp_task { |
| 61 | wait_queue_head_t wait_queue; | 62 | wait_queue_head_t wait_queue; |