kernel: armsr: remove duplicate kconfig between generic and armsr

These were found by running:
comm -12 <(sort target/linux/generic/config-6.18) \
	<(sort target/linux/armsr/config-6.18)

A similar process has been run between armsr/config-6.18
and armsr/armv8/config-6.18, though I have not pruned
the armv8 as much. Once the main branch switches armsr
to 6.18 we can do a more aggressive deduplication.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
Link: https://github.com/openwrt/openwrt/pull/21433
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/armsr/armv8/config-6.18 b/target/linux/armsr/armv8/config-6.18
index 51483f7bb29d3fcc83e9384ee85d874674d5b560..eb62043c10471a9e9f9729b2ef527f8ad63d23d6 100644 (file)
--- a/target/linux/armsr/armv8/config-6.18
+++ b/target/linux/armsr/armv8/config-6.18
@@ -345,7 +345,6 @@ CONFIG_HISILICON_LPC=y
 CONFIG_HISI_PMU=y
 CONFIG_HISI_THERMAL=y
 CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
 # CONFIG_HOTPLUG_PCI_ACPI_AMPERE_ALTRA is not set
 # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
@@ -471,7 +470,6 @@ CONFIG_MMC_DW_ROCKCHIP=y
 # CONFIG_MMC_MXC is not set
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_CADENCE=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_IPROC=y
@@ -653,11 +651,9 @@ CONFIG_PM=y
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
 CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_HISI=y
 # CONFIG_POWER_RESET_TORADEX_EC is not set
 CONFIG_POWER_RESET_VEXPRESS=y
-CONFIG_POWER_SUPPLY=y
 # CONFIG_PTP_1588_CLOCK_DTE is not set
 # CONFIG_PWM_BCM2835 is not set
 CONFIG_QCOM_FALKOR_ERRATUM_1003=y
@@ -734,7 +730,6 @@ CONFIG_SCHED_SMT=y
 # CONFIG_SENSORS_ARM_SCPI is not set
 CONFIG_SERIAL_8250_BCM2835AUX=y
 CONFIG_SERIAL_8250_BCM7271=y
-CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_FSL_LINFLEXUART=y
 CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y
@@ -894,10 +889,8 @@ CONFIG_USB_RENESAS_USBHS=y
 CONFIG_USB_RENESAS_USBHS_HCD=y
 CONFIG_USB_RENESAS_USBHS_UDC=y
 CONFIG_USB_RZV2M_USB3DRD=y
-CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_HISTB=y
 CONFIG_USB_XHCI_MVEBU=y
-CONFIG_USB_XHCI_PLATFORM=y
 # CONFIG_USB_XHCI_RCAR is not set
 CONFIG_USB_XHCI_RZV2M=y
 CONFIG_VEXPRESS_CONFIG=y