aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/gemini/patches-3.18/021-reset-parameters.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-10-05 21:13:36 +0200
committerGitHub <noreply@github.com>2016-10-05 21:13:36 +0200
commit523c36dc04e4fd9558f58bcfb984f9159df7d9c4 (patch)
tree91537a6ff26d4d444e76cb62ac4bbae7187119ec /target/linux/gemini/patches-3.18/021-reset-parameters.patch
parent2839ee70d38eeea18f3423806bfa2fad6c597c25 (diff)
parent6eb5baaa4774f01812d2cef3493e43a0f20e6a3b (diff)
downloadmaster-187ad058-523c36dc04e4fd9558f58bcfb984f9159df7d9c4.tar.gz
master-187ad058-523c36dc04e4fd9558f58bcfb984f9159df7d9c4.tar.bz2
master-187ad058-523c36dc04e4fd9558f58bcfb984f9159df7d9c4.zip
Merge pull request #114 from wigyori/master
gemini: bump to 4.4
Diffstat (limited to 'target/linux/gemini/patches-3.18/021-reset-parameters.patch')
-rw-r--r--target/linux/gemini/patches-3.18/021-reset-parameters.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/target/linux/gemini/patches-3.18/021-reset-parameters.patch b/target/linux/gemini/patches-3.18/021-reset-parameters.patch
deleted file mode 100644
index 644e513746..0000000000
--- a/target/linux/gemini/patches-3.18/021-reset-parameters.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/arch/arm/mach-gemini/reset.c
-+++ b/arch/arm/mach-gemini/reset.c
-@@ -11,10 +11,11 @@
- #define __MACH_SYSTEM_H
-
- #include <linux/io.h>
-+#include <linux/reboot.h>
- #include <mach/hardware.h>
- #include <mach/global_reg.h>
-
--void gemini_restart(char mode, const char *cmd)
-+void gemini_restart(enum reboot_mode mode, const char *cmd)
- {
- __raw_writel(RESET_GLOBAL | RESET_CPU1,
- IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET);
---- a/arch/arm/mach-gemini/common.h
-+++ b/arch/arm/mach-gemini/common.h
-@@ -26,6 +26,6 @@ extern int platform_register_pflash(unsi
- struct mtd_partition *parts,
- unsigned int nr_parts);
-
--extern void gemini_restart(char mode, const char *cmd);
-+extern void gemini_restart(enum reboot_mode mode, const char *cmd);
-
- #endif /* __GEMINI_COMMON_H__ */