diff options
author | 2016-04-11 10:41:07 +0300 | |
---|---|---|
committer | 2016-04-13 08:17:18 +0300 | |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/arch/mips/ralink/prom.c | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/arch/mips/ralink/prom.c')
-rw-r--r-- | kernel/arch/mips/ralink/prom.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/arch/mips/ralink/prom.c b/kernel/arch/mips/ralink/prom.c index 09419f67d..39a9142f7 100644 --- a/kernel/arch/mips/ralink/prom.c +++ b/kernel/arch/mips/ralink/prom.c @@ -15,11 +15,16 @@ #include <asm/bootinfo.h> #include <asm/addrspace.h> +#include <asm/mach-ralink/ralink_regs.h> + #include "common.h" struct ralink_soc_info soc_info; struct rt2880_pmx_group *rt2880_pinmux_data = NULL; +enum ralink_soc_type ralink_soc; +EXPORT_SYMBOL_GPL(ralink_soc); + const char *get_system_type(void) { return soc_info.sys_type; |