diff options
Diffstat (limited to 'target/linux/oxnas')
| -rw-r--r-- | target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch | 8 | ||||
| -rw-r--r-- | target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch b/target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch deleted file mode 100644 index 4cc622b19e..0000000000 --- a/target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/drivers/clocksource/timer-oxnas-rps.c -+++ b/drivers/clocksource/timer-oxnas-rps.c -@@ -296,4 +296,4 @@ err_alloc: - TIMER_OF_DECLARE(ox810se_rps, - "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init); - TIMER_OF_DECLARE(ox820_rps, -- "oxsemi,ox820se-rps-timer", oxnas_rps_timer_init); -+ "oxsemi,ox820-rps-timer", oxnas_rps_timer_init); diff --git a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch index 2374818dbb..3758ca0dc3 100644 --- a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -184,6 +184,6 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> + } +#endif + + /* parameters may set static keys */ + jump_label_init(); parse_early_param(); - after_dashes = parse_args("Booting kernel", - static_command_line, __start___param, |