diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 14:55:12 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 14:55:12 +0400 |
| commit | bf5f48339a019c9b4b42284c3f45d58942cbda27 (patch) | |
| tree | 79976135166ffbdaf4ccb91bcadb17ddb551f060 /arch/mips/mm/uasm-mips.c | |
| parent | d85dad75566674ca8012715ac00a84ced3697972 (diff) | |
| parent | 35582ad9d342025653aaf28ed321bf5352488d7f (diff) | |
| download | linux-bf5f48339a019c9b4b42284c3f45d58942cbda27.tar.xz | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'arch/mips/mm/uasm-mips.c')
| -rw-r--r-- | arch/mips/mm/uasm-mips.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/mm/uasm-mips.c b/arch/mips/mm/uasm-mips.c index 0c724589854e..3abd609518c9 100644 --- a/arch/mips/mm/uasm-mips.c +++ b/arch/mips/mm/uasm-mips.c @@ -15,7 +15,6 @@ #include <linux/kernel.h> #include <linux/types.h> -#include <linux/init.h> #include <asm/inst.h> #include <asm/elf.h> |