diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:10:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:10:40 +0100 |
| commit | 6643aab30f88e2929bcc401a9ae39bf6f1c0b61d (patch) | |
| tree | 72c43e9d7287aef9b8d9699491038edc1929f1f2 /drivers/net/ethernet/ibm/ibmvnic.c | |
| parent | 8fb9dcbdc3619741c10c573199d804161c34c89a (diff) | |
| parent | 045169816b31b10faed984b01c390db1b32ee4c1 (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmvnic.c')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 4f3281a03e7e..0fbf686f5e7c 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -74,7 +74,6 @@ #include <asm/iommu.h> #include <linux/uaccess.h> #include <asm/firmware.h> -#include <linux/seq_file.h> #include <linux/workqueue.h> #include "ibmvnic.h" |