diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-14 14:50:46 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-14 14:50:46 -0700 |
commit | b793b3a75e12ae4576f3d9b6013c8a7d8b0277b8 (patch) | |
tree | e493685833f06462afd5d4edc6e231c33131a633 /drivers/net/pppol2tp.c | |
parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
parent | c0912585ec8b64d846d56995241f2c8a7f48ee75 (diff) |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/pppol2tp.c')
-rw-r--r-- | drivers/net/pppol2tp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c index f9298827a76..ff175e8f36b 100644 --- a/drivers/net/pppol2tp.c +++ b/drivers/net/pppol2tp.c @@ -61,7 +61,6 @@ */ #include <linux/module.h> -#include <linux/version.h> #include <linux/string.h> #include <linux/list.h> #include <asm/uaccess.h> |