diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 01:31:56 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 01:31:56 +0100 |
| commit | d779188d2baf436e67fe8816fca2ef53d246900f (patch) | |
| tree | 9bac75842a5611172860feec3c4019ff874a2b89 /drivers/net/chelsio/sge.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | linux-d779188d2baf436e67fe8816fca2ef53d246900f.tar.xz linux-d779188d2baf436e67fe8816fca2ef53d246900f.zip | |
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 *); int t1_sge_set_coalesce_params(struct sge *, struct sge_params *); void t1_sge_destroy(struct sge *); intr_handler_t t1_select_intr_handler(adapter_t *adapter); -unsigned int t1_sge_tx(struct sk_buff *skb, struct adapter *adapter, - unsigned int qid, struct net_device *netdev); int t1_start_xmit(struct sk_buff *skb, struct net_device *dev); void t1_set_vlan_accel(struct adapter *adapter, int on_off); void t1_sge_start(struct sge *); |