diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/net/wan | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/net/wan')
| -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) | |||
| 1440 | * @skb: The buffer to process | 1440 | * @skb: The buffer to process |
| 1441 | * @dev: The device it arrived on | 1441 | * @dev: The device it arrived on |
| 1442 | * @p: Unused | 1442 | * @p: Unused |
| 1443 | * @orig_dev: Unused | ||
| 1443 | * | 1444 | * |
| 1444 | * Protocol glue. This drives the deferred processing mode the poorer | 1445 | * Protocol glue. This drives the deferred processing mode the poorer |
| 1445 | * cards use. This can be called directly by cards that do not have | 1446 | * cards use. This can be called directly by cards that do not have |