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 | cc896f08717c445235554a7963a7b2ecf58911ad (diff) | |
| parent | 344babaa9d39b10b85cadec4e5335d43b52b4ec0 (diff) | |
| download | op-kernel-dev-0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a.zip op-kernel-dev-0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a.tar.gz | |
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 f58c794..b56a7b5 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 |
