[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: Revert "mediatek: add support for Netgear WAX206" ramips: Fix drivers/pwm/pwm-mediatek-ramips.c compile kernel: Move CONFIG_PWM_IMG and CONFIG_PWM_MEDIATEK to generic configuration kernel: Move CONFIG_DRM_XEN_FRONTEND to generic configuration
aiastia-bak · Dec 25, 2022 · 70f4a4a · 70f4a4a
2 parents 0149f8d + 81e04f0
commit 70f4a4a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 640 deletions.
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
@@ -4560,6 +4560,9 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_PWM is not set
 # CONFIG_PWM_DEBUG is not set
 # CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_IMG is not set
+# CONFIG_PWM_JZ4740 is not set
+# CONFIG_PWM_MEDIATEK is not set
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWRSEQ_EMMC=y
 # CONFIG_PWRSEQ_SD8787 is not set

diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
@@ -1652,6 +1652,7 @@ CONFIG_DQL=y
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_VMWGFX is not set
 # CONFIG_DRM_XEN is not set
+# CONFIG_DRM_XEN_FRONTEND is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DS4424 is not set
@@ -4813,7 +4814,9 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 # CONFIG_PWM_DEBUG is not set
 # CONFIG_PWM_DWC is not set
 # CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_IMG is not set
 # CONFIG_PWM_JZ4740 is not set
+# CONFIG_PWM_MEDIATEK is not set
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWRSEQ_EMMC=y
 # CONFIG_PWRSEQ_SD8787 is not set