diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:31:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:31:56 -0500 |
| commit | d779188d2baf436e67fe8816fca2ef53d246900f (patch) | |
| tree | 9bac75842a5611172860feec3c4019ff874a2b89 /drivers/net/chelsio/sge.h | |
| parent | f61ea1b0c825a20a1826bb43a226387091934586 (diff) | |
| parent | ac67c6247361b3b8644b34e5301a46d5069c1373 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/chelsio/sge.h')
| -rw-r--r-- | drivers/net/chelsio/sge.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/chelsio/sge.h b/drivers/net/chelsio/sge.h index 434b25586851..6d0d24a6364f 100644 --- a/drivers/net/chelsio/sge.h +++ b/drivers/net/chelsio/sge.h | |||
| @@ -89,8 +89,6 @@ int t1_sge_configure(struct sge *, struct sge_params *); | |||
| 89 | int t1_sge_set_coalesce_params(struct sge *, struct sge_params *); | 89 | int t1_sge_set_coalesce_params(struct sge *, struct sge_params *); |
| 90 | void t1_sge_destroy(struct sge *); | 90 | void t1_sge_destroy(struct sge *); |
| 91 | intr_handler_t t1_select_intr_handler(adapter_t *adapter); | 91 | intr_handler_t t1_select_intr_handler(adapter_t *adapter); |
| 92 | unsigned int t1_sge_tx(struct sk_buff *skb, struct adapter *adapter, | ||
| 93 | unsigned int qid, struct net_device *netdev); | ||
| 94 | int t1_start_xmit(struct sk_buff *skb, struct net_device *dev); | 92 | int t1_start_xmit(struct sk_buff *skb, struct net_device *dev); |
| 95 | void t1_set_vlan_accel(struct adapter *adapter, int on_off); | 93 | void t1_set_vlan_accel(struct adapter *adapter, int on_off); |
| 96 | void t1_sge_start(struct sge *); | 94 | void t1_sge_start(struct sge *); |