summaryrefslogtreecommitdiff
path: root/arch/powerpc/oprofile/op_model_7450.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-02-20 14:55:12 +0400
committerJohannes Berg <johannes.berg@intel.com>2014-02-20 14:55:12 +0400
commitbf5f48339a019c9b4b42284c3f45d58942cbda27 (patch)
tree79976135166ffbdaf4ccb91bcadb17ddb551f060 /arch/powerpc/oprofile/op_model_7450.c
parentd85dad75566674ca8012715ac00a84ced3697972 (diff)
parent35582ad9d342025653aaf28ed321bf5352488d7f (diff)
downloadlinux-bf5f48339a019c9b4b42284c3f45d58942cbda27.tar.xz
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'arch/powerpc/oprofile/op_model_7450.c')
-rw-r--r--arch/powerpc/oprofile/op_model_7450.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/oprofile/op_model_7450.c b/arch/powerpc/oprofile/op_model_7450.c
index ff617246d128..d29b6e4e5e72 100644
--- a/arch/powerpc/oprofile/op_model_7450.c
+++ b/arch/powerpc/oprofile/op_model_7450.c
@@ -16,7 +16,6 @@
*/
#include <linux/oprofile.h>
-#include <linux/init.h>
#include <linux/smp.h>
#include <asm/ptrace.h>
#include <asm/processor.h>