diff options
| author |   Chris Zankel <chris@zankel.net> | 2014-02-24 00:34:36 -0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-02-24 00:34:36 -0800 |
| commit | b3fdfc1b4b641d372e35ced98814289bc60bc5d1 (patch) | |
| tree | 5f11d5ba885031dde45690745646519fb887f447 /drivers/net/loopback.c | |
| parent | xtensa: fix fast_syscall_spill_registers (diff) | |
| parent | xtensa: wire up sched_setattr and sched_getattr syscalls (diff) | |
| download | wireguard-linux-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.tar.xz wireguard-linux-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.zip | |
Merge tag 'xtensa-for-next-20140221-1' into for_next
Xtensa fixes for 3.14:
- allow booting xtfpga on boards with new uBoot and >128MBytes memory;
- drop nonexistent GPIO32 support from fsf variant;
- don't select USE_GENERIC_SMP_HELPERS;
- enable common clock framework support, set up ethoc clock on xtfpga;
- wire up sched_setattr and sched_getattr syscalls.
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'drivers/net/loopback.c')
| -rw-r--r-- | drivers/net/loopback.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index ac24c27b4b2d..c5011e078e1b 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -39,7 +39,6 @@ #include <linux/errno.h> #include <linux/fcntl.h> #include <linux/in.h> -#include <linux/init.h> #include <asm/uaccess.h> #include <asm/io.h> |