aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-02-23 19:23:06 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-02-23 21:08:21 +0100
commit5e9b07ff365fc89e8eea271e63f202ff1afc33bd (patch)
treec3a8dbe9aaafd666674af22e864c1da80ec4ada6
parent55ed4bf6d7bf80b705d015c3b73f772db485ba9c (diff)
downloadupstream-5e9b07ff365fc89e8eea271e63f202ff1afc33bd.tar.gz
upstream-5e9b07ff365fc89e8eea271e63f202ff1afc33bd.tar.bz2
upstream-5e9b07ff365fc89e8eea271e63f202ff1afc33bd.zip
kernel: add symbol CONFIG_POWER_RESET_LINKSTATION
Add symbol to generic config (this was added between 5.4 and 5.10), and remove it from the targets where it was added by kernel_oldconfig in the meantime. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/generic/config-5.101
-rw-r--r--target/linux/mvebu/cortexa53/config-5.101
-rw-r--r--target/linux/mvebu/cortexa72/config-5.101
3 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index b0cf7c7d42..d8c5017083 100644
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -4384,6 +4384,7 @@ CONFIG_POSIX_TIMERS=y
# CONFIG_POWER_RESET_BRCMSTB is not set
# CONFIG_POWER_RESET_GPIO is not set
# CONFIG_POWER_RESET_GPIO_RESTART is not set
+# CONFIG_POWER_RESET_LINKSTATION is not set
# CONFIG_POWER_RESET_LTC2952 is not set
# CONFIG_POWER_RESET_PIIX4_POWEROFF is not set
# CONFIG_POWER_RESET_RESTART is not set
diff --git a/target/linux/mvebu/cortexa53/config-5.10 b/target/linux/mvebu/cortexa53/config-5.10
index a3de912b99..c70bea5ae5 100644
--- a/target/linux/mvebu/cortexa53/config-5.10
+++ b/target/linux/mvebu/cortexa53/config-5.10
@@ -66,7 +66,6 @@ CONFIG_PINCTRL_ARMADA_37XX=y
CONFIG_PINCTRL_ARMADA_AP806=y
CONFIG_PINCTRL_ARMADA_CP110=y
CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_LINKSTATION is not set
CONFIG_POWER_SUPPLY=y
CONFIG_QUEUED_RWLOCKS=y
CONFIG_QUEUED_SPINLOCKS=y
diff --git a/target/linux/mvebu/cortexa72/config-5.10 b/target/linux/mvebu/cortexa72/config-5.10
index 6ffe6c9f13..a9b7e20dc1 100644
--- a/target/linux/mvebu/cortexa72/config-5.10
+++ b/target/linux/mvebu/cortexa72/config-5.10
@@ -73,7 +73,6 @@ CONFIG_PINCTRL_ARMADA_37XX=y
CONFIG_PINCTRL_ARMADA_AP806=y
CONFIG_PINCTRL_ARMADA_CP110=y
CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_LINKSTATION is not set
CONFIG_POWER_SUPPLY=y
CONFIG_QUEUED_RWLOCKS=y
CONFIG_QUEUED_SPINLOCKS=y