diff options
| author | Mathias Kresin <dev@kresin.me> | 2020-03-04 00:39:59 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2020-03-16 22:28:16 +0100 |
| commit | a6698551e5bc4b2f049b3303a664ae67d6a0494e (patch) | |
| tree | a04f7e740d17959b80465e24d5a83f2e3e79d85a /package/kernel/lantiq/ltq-adsl/patches/120-platform.patch | |
| parent | a3539c82cb38366151019438ea841e8ae47cb1c2 (diff) | |
| download | upstream-a6698551e5bc4b2f049b3303a664ae67d6a0494e.tar.gz upstream-a6698551e5bc4b2f049b3303a664ae67d6a0494e.tar.bz2 upstream-a6698551e5bc4b2f049b3303a664ae67d6a0494e.zip | |
ltq-adsl: fix compilation with Linux 5.0+
Upstream commit e4b92b108c6cd6 ("timekeeping: remove obsolete time
accessors") removed do_gettimeofday(). In Linux 4.19 this was only a
wrapper around ktime_get_real_ts64(). Use ktime_get_real_ts64() now that
the wrapper is gone to fix compilation against Linux 5.4.
Move the ifxmips_mei_interface header to the include directory, it can't
be found otherwise during compilation. The reason for the changed
behaviour is not yet clear, however having header files in an include
directory is more straight forward.
To use the of_device_id struct, the mod_devicetable header need to be
included. Instead of including this header, include the of_platform
header, which includes the mod_devicetable on its own.
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'package/kernel/lantiq/ltq-adsl/patches/120-platform.patch')
| -rw-r--r-- | package/kernel/lantiq/ltq-adsl/patches/120-platform.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/package/kernel/lantiq/ltq-adsl/patches/120-platform.patch b/package/kernel/lantiq/ltq-adsl/patches/120-platform.patch index 20c1ccf471..e1dc254ec0 100644 --- a/package/kernel/lantiq/ltq-adsl/patches/120-platform.patch +++ b/package/kernel/lantiq/ltq-adsl/patches/120-platform.patch @@ -1,14 +1,15 @@ --- a/src/common/drv_dsl_cpe_os_linux.c +++ b/src/common/drv_dsl_cpe_os_linux.c -@@ -12,6 +12,7 @@ +@@ -11,7 +11,7 @@ + #ifdef __LINUX__ #define DSL_INTERN - #include <linux/device.h> -+#include <linux/platform_device.h> +-#include <linux/device.h> ++#include <linux/of_platform.h> #include "drv_dsl_cpe_api.h" #include "drv_dsl_cpe_api_ioctl.h" -@@ -1063,7 +1064,7 @@ static void DSL_DRV_DebugInit(void) +@@ -1070,7 +1070,7 @@ static void DSL_DRV_DebugInit(void) #endif /* Entry point of driver */ @@ -17,7 +18,7 @@ { struct class *dsl_class; DSL_int_t i; -@@ -1117,7 +1118,7 @@ int __init DSL_ModuleInit(void) +@@ -1124,7 +1124,7 @@ int __init DSL_ModuleInit(void) return 0; } @@ -26,7 +27,7 @@ { printk("Module will be unloaded"DSL_DRV_CRLF); -@@ -1132,7 +1133,7 @@ void __exit DSL_ModuleCleanup(void) +@@ -1139,7 +1139,7 @@ void __exit DSL_ModuleCleanup(void) (DSL_uint8_t**)&g_BndFpgaBase); #endif /* defined(INCLUDE_DSL_CPE_API_VINAX) && defined(INCLUDE_DSL_BONDING)*/ @@ -35,7 +36,7 @@ } #ifndef _lint -@@ -1148,8 +1149,30 @@ module_param(debug_level, byte, 0); +@@ -1155,8 +1155,30 @@ module_param(debug_level, byte, 0); MODULE_PARM_DESC(debug_level, "set to get more (1) or fewer (4) debug outputs"); #endif /* #ifndef DSL_DEBUG_DISABLE*/ |