diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 11:55:12 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 11:55:12 +0100 |
| commit | bf5f48339a019c9b4b42284c3f45d58942cbda27 (patch) | |
| tree | 79976135166ffbdaf4ccb91bcadb17ddb551f060 /arch/mips/kernel/spram.c | |
| parent | d85dad75566674ca8012715ac00a84ced3697972 (diff) | |
| parent | 35582ad9d342025653aaf28ed321bf5352488d7f (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'arch/mips/kernel/spram.c')
| -rw-r--r-- | arch/mips/kernel/spram.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/kernel/spram.c b/arch/mips/kernel/spram.c index 93f86817f20..b242e2c10ea 100644 --- a/arch/mips/kernel/spram.c +++ b/arch/mips/kernel/spram.c @@ -8,7 +8,6 @@ * * Copyright (C) 2007, 2008 MIPS Technologies, Inc. */ -#include <linux/init.h> #include <linux/kernel.h> #include <linux/ptrace.h> #include <linux/stddef.h> @@ -206,6 +205,8 @@ void spram_config(void) case CPU_34K: case CPU_74K: case CPU_1004K: + case CPU_INTERAPTIV: + case CPU_PROAPTIV: config0 = read_c0_config(); /* FIXME: addresses are Malta specific */ if (config0 & (1<<24)) { |