diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /drivers/net/hamradio/bpqether.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/net/hamradio/bpqether.c')
| -rw-r--r-- | drivers/net/hamradio/bpqether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 2946e037a9b1..1756f0ed54cc 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
| @@ -488,7 +488,7 @@ static void bpq_setup(struct net_device *dev) | |||
| 488 | dev->flags = 0; | 488 | dev->flags = 0; |
| 489 | 489 | ||
| 490 | #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) | 490 | #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) |
| 491 | dev->hard_header = ax25_encapsulate; | 491 | dev->hard_header = ax25_hard_header; |
| 492 | dev->rebuild_header = ax25_rebuild_header; | 492 | dev->rebuild_header = ax25_rebuild_header; |
| 493 | #endif | 493 | #endif |
| 494 | 494 | ||