Drop arm-config-multi-v7-enable-dependancies.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.14/arm-config-multi-v7-enable-dependancies.patch b/queue-5.14/arm-config-multi-v7-enable-dependancies.patch
deleted file mode 100644 (file)
index 9b4048e..0000000
--- a/queue-5.14/arm-config-multi-v7-enable-dependancies.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 23fcc1a6f7c61074d2788e96112585c619fa677c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 15 Jun 2021 10:44:33 +0930
-Subject: ARM: config: multi v7: Enable dependancies
-
-From: Joel Stanley <joel@jms.id.au>
-
-[ Upstream commit cf8dd57bd0d62133e4ed9e1ad83af994fac34da5 ]
-
-Some drivers have not been built as they gained dependencies in kconfig but those
-dependencies were not added to the defconfig.
-
-The MSM pinctrl drivers fell out of the defconfig as of commit be117ca32261
-("pinctrl: qcom: Kconfig: Rework PINCTRL_MSM to be a depenency rather then a
-selected config"). Add PINCTRL_MSM so these stay enabled.
-
-EDAC depends on RAS, so enable it to ensure the EDAC drivers stay
-enabled.
-
-Signed-off-by: Joel Stanley <joel@jms.id.au>
-Reviewed-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/configs/multi_v7_defconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
-index d9abaae118dd..bd5775184c03 100644
---- a/arch/arm/configs/multi_v7_defconfig
-+++ b/arch/arm/configs/multi_v7_defconfig
-@@ -454,6 +454,7 @@ CONFIG_PINCTRL_STMFX=y
- CONFIG_PINCTRL_PALMAS=y
- CONFIG_PINCTRL_OWL=y
- CONFIG_PINCTRL_S500=y
-+CONFIG_PINCTRL_MSM=y
- CONFIG_PINCTRL_APQ8064=y
- CONFIG_PINCTRL_APQ8084=y
- CONFIG_PINCTRL_IPQ8064=y
-@@ -1114,6 +1115,7 @@ CONFIG_PHY_DM816X_USB=m
- CONFIG_OMAP_USB2=y
- CONFIG_TI_PIPE3=y
- CONFIG_TWL4030_USB=m
-+CONFIG_RAS=y
- CONFIG_NVMEM_IMX_OCOTP=y
- CONFIG_ROCKCHIP_EFUSE=m
- CONFIG_NVMEM_SUNXI_SID=y
--- 
-2.33.0
-

diff --git a/queue-5.14/series b/queue-5.14/series
index 5197c3fae06bfaed7819de2a8c8a00956dd680c8..2fb2c076a8edfa22c6ee35568206352ff13fcb47 100644 (file)
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -2,7 +2,6 @@ block-mq-deadline-move-dd_queued-to-fix-defined-but-not-used-warning.patch
 parisc-math-emu-fix-fall-through-warnings.patch
 sh-pgtable-3level-fix-cast-to-pointer-from-integer-of-different-size.patch
 arm-dts-vexpress-v2p-ca9-fix-the-smb-unit-address.patch
-arm-config-multi-v7-enable-dependancies.patch
 arm-config-mutli-v7-reenable-fb-dependency.patch
 arm-dts-at91-sama5d2_som1_ek-disable-isc-node-by-def.patch
 block-decode-queue_flag_hctx_active-in-debugfs-outpu.patch