kernel: reorder generic config-6.18

Fixes: fafc2e5925e4 ("bcm27xx: refresh default configs for 6.18")
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/24412
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/generic/config-6.18 b/target/linux/generic/config-6.18
index 2141bc0d07f4d20ad50c10f2adf6c42f358c5e54..ef15d72352f388c70d3dcf8b02243e08d38b9e15 100644 (file)
--- a/target/linux/generic/config-6.18
+++ b/target/linux/generic/config-6.18
@@ -770,11 +770,11 @@ CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPQETHER is not set
 CONFIG_BQL=y
 CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_BRCM_CHAR_DRIVERS is not set
 # CONFIG_BRCMFMAC is not set
 # CONFIG_BRCMSMAC is not set
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_BRCMSTB_L2_IRQ is not set
+# CONFIG_BRCM_CHAR_DRIVERS is not set
 CONFIG_BRIDGE=y
 # CONFIG_BRIDGE_CFM is not set
 # CONFIG_BRIDGE_EBT_802_3 is not set
@@ -1486,7 +1486,6 @@ CONFIG_DIMLIB=y
 # CONFIG_DLM is not set
 # CONFIG_DM9000 is not set
 # CONFIG_DM9051 is not set
-# CONFIG_DMA_BCM2708 is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_HEAPS is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
@@ -1500,6 +1499,7 @@ CONFIG_DIMLIB=y
 # CONFIG_DMARD10 is not set
 # CONFIG_DMATEST is not set
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_BCM2708 is not set
 CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_DECLARE_COHERENT=y
 # CONFIG_DMA_ENGINE is not set
@@ -2104,7 +2104,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_FAULT_INJECTION is not set
-# CONFIG_FB_BCM2708 is not set
 # CONFIG_FB is not set
 # CONFIG_FBNIC is not set
 # CONFIG_FB_3DFX is not set
@@ -2115,6 +2114,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_ATY is not set
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_BCM2708 is not set
 # CONFIG_FB_BIG_ENDIAN is not set
 # CONFIG_FB_BOTH_ENDIAN is not set
 # CONFIG_FB_BROADSHEET is not set
@@ -2346,8 +2346,6 @@ CONFIG_GENERIC_VDSO_TIME_NS=y
 # CONFIG_GP2AP020A00F is not set
 # CONFIG_GPD_POCKET_FAN is not set
 # CONFIG_GPIB is not set
-# CONFIG_GPIO_BCM_VIRT is not set
-# CONFIG_GPIO_FSM is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_GPIOLIB_LEGACY=y
@@ -2363,6 +2361,7 @@ CONFIG_GPIOLIB_LEGACY=y
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_AMD_FCH is not set
 # CONFIG_GPIO_BCM_KONA is not set
+# CONFIG_GPIO_BCM_VIRT is not set
 # CONFIG_GPIO_BRCMSTB is not set
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_CADENCE is not set
@@ -2374,6 +2373,7 @@ CONFIG_GPIOLIB_LEGACY=y
 # CONFIG_GPIO_EM is not set
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_F7188X is not set
+# CONFIG_GPIO_FSM is not set
 # CONFIG_GPIO_FTGPIO010 is not set
 # CONFIG_GPIO_FXL6408 is not set
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
@@ -3363,10 +3363,9 @@ CONFIG_LEDS_CLASS_MULTICOLOR=y
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TI_LMU_COMMON is not set
 # CONFIG_LEDS_TLC591XX is not set
-# CONFIG_LEDS_TRIGGER_ACTPWR is not set
-# CONFIG_LEDS_TRIGGER_INPUT is not set
 CONFIG_LEDS_TRIGGERS=y
 # CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+# CONFIG_LEDS_TRIGGER_ACTPWR is not set
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 # CONFIG_LEDS_TRIGGER_CAMERA is not set
 # CONFIG_LEDS_TRIGGER_CPU is not set
@@ -3374,6 +3373,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_DISK is not set
 # CONFIG_LEDS_TRIGGER_GPIO is not set
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_INPUT is not set
 # CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 # CONFIG_LEDS_TRIGGER_MTD is not set
 CONFIG_LEDS_TRIGGER_NETDEV=y
@@ -5309,7 +5309,6 @@ CONFIG_RCU_STALL_COMMON=y
 # CONFIG_REGMAP_I2C is not set
 # CONFIG_REGMAP_MMIO is not set
 # CONFIG_REGMAP_SPI is not set
-# CONFIG_REGULATOR_EDATEC_PANEL is not set
 # CONFIG_REGULATOR is not set
 # CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set
@@ -5321,6 +5320,7 @@ CONFIG_RCU_STALL_COMMON=y
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
 # CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_EDATEC_PANEL is not set
 # CONFIG_REGULATOR_FAN53555 is not set
 # CONFIG_REGULATOR_FAN53880 is not set
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
@@ -6206,10 +6206,37 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SM_GCC_6350 is not set
 # CONFIG_SM_GCC_6375 is not set
 # CONFIG_SM_GCC_8350 is not set
+# CONFIG_SND is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ADLIB is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_AMD_ACP_CONFIG is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_ASIHPI is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_ATMEL_AC97C is not set
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
 # CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD is not set
 # CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD is not set
 # CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD is not set
 # CONFIG_SND_AUDIOSENSE_PI is not set
+# CONFIG_SND_AUDIO_GRAPH_CARD is not set
+# CONFIG_SND_AUDIO_GRAPH_CARD2 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BCD2000 is not set
 # CONFIG_SND_BCM2708_SOC_ADAU1977_ADC is not set
 # CONFIG_SND_BCM2708_SOC_ALLO_BOSS2_DAC is not set
 # CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC is not set
@@ -6244,35 +6271,6 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SND_BCM2708_SOC_RPI_CIRRUS is not set
 # CONFIG_SND_BCM2708_SOC_RPI_DAC is not set
 # CONFIG_SND_BCM2708_SOC_RPI_PROTO is not set
-# CONFIG_SND_DACBERRY400 is not set
-# CONFIG_SND_DIGIDAC1_SOUNDCARD is not set
-# CONFIG_SND is not set
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ADLIB is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ALOOP is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_AMD_ACP_CONFIG is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_ASIHPI is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_ATMEL_AC97C is not set
-# CONFIG_SND_ATMEL_SOC is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_AUDIO_GRAPH_CARD2 is not set
-# CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BCD2000 is not set
 # CONFIG_SND_BCM2835 is not set
 # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
 # CONFIG_SND_BT87X is not set
@@ -6288,10 +6286,12 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SND_CTL_FAST_LOOKUP is not set
 # CONFIG_SND_CTL_INPUT_VALIDATION is not set
 # CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DACBERRY400 is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_DARLA24 is not set
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DESIGNWARE_I2S is not set
+# CONFIG_SND_DIGIDAC1_SOUNDCARD is not set
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_DYNAMIC_MINORS is not set
@@ -6428,7 +6428,6 @@ CONFIG_SND_PROC_FS=y
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_SIMPLE_CARD is not set
 # CONFIG_SND_SIS7019 is not set
-# CONFIG_SND_SOC_I_SABRE_CODEC is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SOC_AC97_CODEC is not set
 # CONFIG_SND_SOC_AD193X_I2C is not set
@@ -6571,6 +6570,7 @@ CONFIG_SND_PROC_FS=y
 # CONFIG_SND_SOC_INTEL_SST is not set
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
 # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+# CONFIG_SND_SOC_I_SABRE_CODEC is not set
 # CONFIG_SND_SOC_JZ4725B_CODEC is not set
 # CONFIG_SND_SOC_JZ4740_CODEC is not set
 # CONFIG_SND_SOC_JZ4770_CODEC is not set
@@ -7387,7 +7387,6 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_UPROBES is not set
 # CONFIG_UPROBE_EVENTS is not set
 # CONFIG_US5182D is not set
-# CONFIG_USB_DWCOTG is not set
 # CONFIG_USB is not set
 # CONFIG_USB4 is not set
 # CONFIG_USBIP_CORE is not set
@@ -7451,6 +7450,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_DWC3_PCI is not set
 # CONFIG_USB_DWC3_QCOM is not set
 # CONFIG_USB_DWC3_ULPI is not set
+# CONFIG_USB_DWCOTG is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EG20T is not set
 # CONFIG_USB_EHCI_FSL is not set
@@ -7896,8 +7896,8 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_IMX_PXP is not set
 # CONFIG_VIDEO_INTEL_IPU6 is not set
 # CONFIG_VIDEO_IPU3_CIO2 is not set
-# CONFIG_VIDEO_IR_I2C is not set
 # CONFIG_VIDEO_IRS1125 is not set
+# CONFIG_VIDEO_IR_I2C is not set
 # CONFIG_VIDEO_ISL7998X is not set
 # CONFIG_VIDEO_ISP_BCM2835 is not set
 # CONFIG_VIDEO_IVTV is not set