Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

2005-09-07 17:28:25 -07:00
parent cc896f0871 344babaa9d
commit 0dd7f883a9
5 changed files with 6 additions and 4 deletions
--- 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