diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-26 10:25:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-26 10:25:59 +0200 |
commit | 3cf430b0636045dc524759a0852293ba037732a7 (patch) | |
tree | 2c4e03f9028dc23ab4e6ca5a3a5a263af397984f /drivers/net/ppp_mppe.c | |
parent | wait_task_inactive: "improve" the returned value for ->nvcsw == 0 (diff) | |
parent | Fix oops in acer_wmi driver (acer_wmi_init) (diff) | |
download | linux-3cf430b0636045dc524759a0852293ba037732a7.tar.xz linux-3cf430b0636045dc524759a0852293ba037732a7.zip |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'drivers/net/ppp_mppe.c')
-rw-r--r-- | drivers/net/ppp_mppe.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c index b35d79449500..88f03c9e9403 100644 --- a/drivers/net/ppp_mppe.c +++ b/drivers/net/ppp_mppe.c @@ -46,7 +46,6 @@ #include <linux/err.h> #include <linux/module.h> #include <linux/kernel.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/types.h> #include <linux/slab.h> |