diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:28:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:28:25 -0700 |
| commit | 0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a (patch) | |
| tree | 080ba867394e0346b699ffe17973a76faa0e6920 /drivers/net | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| parent | [kernel-doc] fix various DocBook build problems/warnings (diff) | |
| download | linux-dev-0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a.tar.xz linux-dev-0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a.zip | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wan/syncppp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c index f58c794a963a..b56a7b516d24 100644 --- a/drivers/net/wan/syncppp.c +++ b/drivers/net/wan/syncppp.c @@ -1440,6 +1440,7 @@ static void sppp_print_bytes (u_char *p, u16 len) * @skb: The buffer to process * @dev: The device it arrived on * @p: Unused + * @orig_dev: Unused * * Protocol glue. This drives the deferred processing mode the poorer * cards use. This can be called directly by cards that do not have |