diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/enic/vnic_wq.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/enic/vnic_wq.h')
| -rw-r--r-- | drivers/net/enic/vnic_wq.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/enic/vnic_wq.h b/drivers/net/enic/vnic_wq.h index 94ac4621acc5..7dd937ac11c2 100644 --- a/drivers/net/enic/vnic_wq.h +++ b/drivers/net/enic/vnic_wq.h | |||
| @@ -153,10 +153,6 @@ static inline void vnic_wq_service(struct vnic_wq *wq, | |||
| 153 | void vnic_wq_free(struct vnic_wq *wq); | 153 | void vnic_wq_free(struct vnic_wq *wq); |
| 154 | int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index, | 154 | int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index, |
| 155 | unsigned int desc_count, unsigned int desc_size); | 155 | unsigned int desc_count, unsigned int desc_size); |
| 156 | void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index, | ||
| 157 | unsigned int fetch_index, unsigned int posted_index, | ||
| 158 | unsigned int error_interrupt_enable, | ||
| 159 | unsigned int error_interrupt_offset); | ||
| 160 | void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index, | 156 | void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index, |
| 161 | unsigned int error_interrupt_enable, | 157 | unsigned int error_interrupt_enable, |
| 162 | unsigned int error_interrupt_offset); | 158 | unsigned int error_interrupt_offset); |