projects
/
openwrt
/
staging
/
mkresin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oxnas: revert to kernel 4.1
[openwrt/staging/mkresin.git]
/
target
/
linux
/
oxnas
/
files
/
arch
/
arm
/
mach-oxnas
/
mach-ox820.c
diff --git
a/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c
b/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c
index 31b7c90582345134ec7abe4006e5603fb1a95ddd..4d648c63d2384e164b0dfe433c00a42206cbce5e 100644
(file)
--- a/
target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c
+++ b/
target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c
@@
-8,6
+8,7
@@
#include <linux/slab.h>
#include <linux/gfp.h>
#include <linux/reset.h>
#include <linux/slab.h>
#include <linux/gfp.h>
#include <linux/reset.h>
+#include <linux/version.h>
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
@@
-73,7
+74,11
@@
static void __init ox820_dt_init(void)
static void __init ox820_timer_init(void)
{
of_clk_init(NULL);
static void __init ox820_timer_init(void)
{
of_clk_init(NULL);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
+ clocksource_of_init();
+#else
clocksource_probe();
clocksource_probe();
+#endif
}
void ox820_init_early(void)
}
void ox820_init_early(void)