diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-23 01:49:27 +0200 |
|---|---|---|
| committer | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-23 01:49:27 +0200 |
| commit | f056878332a91ed984a116bad4e7d49aefff9e6e (patch) | |
| tree | 572f4757c8e7811d45e0be0c2ae529c78fb63441 /drivers/net/wan/z85230.h | |
| parent | power_supply: Add driver for the PMU on WM831x PMICs (diff) | |
| parent | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-f056878332a91ed984a116bad4e7d49aefff9e6e.tar.xz linux-f056878332a91ed984a116bad4e7d49aefff9e6e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/wm97xx_battery.c
Diffstat (limited to 'drivers/net/wan/z85230.h')
| -rw-r--r-- | drivers/net/wan/z85230.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wan/z85230.h b/drivers/net/wan/z85230.h index 85b3e785d484..f29d554fc07d 100644 --- a/drivers/net/wan/z85230.h +++ b/drivers/net/wan/z85230.h @@ -406,7 +406,8 @@ extern int z8530_sync_dma_close(struct net_device *, struct z8530_channel *); extern int z8530_sync_txdma_open(struct net_device *, struct z8530_channel *); extern int z8530_sync_txdma_close(struct net_device *, struct z8530_channel *); extern int z8530_channel_load(struct z8530_channel *, u8 *); -extern int z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb); +extern netdev_tx_t z8530_queue_xmit(struct z8530_channel *c, + struct sk_buff *skb); extern void z8530_null_rx(struct z8530_channel *c, struct sk_buff *skb); |