diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 18:55:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 18:55:09 -0400 |
| commit | 61b22e693ea33af02f3380d3dbed9ee65a80c729 (patch) | |
| tree | 4507ddcc055109e35a03820115abd7c09a5d0cdd /drivers/net/hamradio/scc.c | |
| parent | 3a3bca5ace9123d1a6b890ceac2902ebf2b1fd50 (diff) | |
| parent | 24b8e05dc1b03c1f80828e642838511c16e17250 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/hamradio/scc.c')
| -rw-r--r-- | drivers/net/hamradio/scc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index c27e417f32bf..6ace0e914fd1 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
| @@ -1557,7 +1557,7 @@ static void scc_net_setup(struct net_device *dev) | |||
| 1557 | dev->stop = scc_net_close; | 1557 | dev->stop = scc_net_close; |
| 1558 | 1558 | ||
| 1559 | dev->hard_start_xmit = scc_net_tx; | 1559 | dev->hard_start_xmit = scc_net_tx; |
| 1560 | dev->hard_header = ax25_encapsulate; | 1560 | dev->hard_header = ax25_hard_header; |
| 1561 | dev->rebuild_header = ax25_rebuild_header; | 1561 | dev->rebuild_header = ax25_rebuild_header; |
| 1562 | dev->set_mac_address = scc_net_set_mac_address; | 1562 | dev->set_mac_address = scc_net_set_mac_address; |
| 1563 | dev->get_stats = scc_net_get_stats; | 1563 | dev->get_stats = scc_net_get_stats; |