diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-04 09:09:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-04 09:09:27 +0200 |
| commit | d7619fe39d9769b4d4545cc511c891deea18ae08 (patch) | |
| tree | 0a902533414001075b2245825e145cc2e35ce985 /drivers/net/pptp.c | |
| parent | 9ea71503a8ed9184d2d0b8ccc4d269d05f7940ae (diff) | |
| parent | ed8f37370d83e695c0a4fa5d5fc7a83ecb947526 (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'drivers/net/pptp.c')
| -rw-r--r-- | drivers/net/pptp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/pptp.c b/drivers/net/pptp.c index 1286fe212dc..eae542a7e98 100644 --- a/drivers/net/pptp.c +++ b/drivers/net/pptp.c @@ -30,7 +30,6 @@ #include <linux/ip.h> #include <linux/netfilter.h> #include <linux/netfilter_ipv4.h> -#include <linux/version.h> #include <linux/rcupdate.h> #include <linux/spinlock.h> |