Skip to content

Commit e3a2e20

Browse files
committed
Merge tag 'omap-for-v5.10/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/defconfig
Defconfig changes for omaps for v5.10 merge window Enable twl4030_madc as a loadable module as the ADC is used on some devices by the battery charger. And enable more widely used networking options as loadable modules where possible. * tag 'omap-for-v5.10/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: omap2plus_defconfig: enable generic net options ARM: omap2plus_defconfig: enable twl4030_madc as a loadable module Link: https://lore.kernel.org/r/pull-1601445968-476435@atomide.com-3 Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents b402b4e + 7462375 commit e3a2e20

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

arch/arm/configs/omap2plus_defconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,18 @@ CONFIG_IP_PNP_DHCP=y
9595
CONFIG_IP_PNP_BOOTP=y
9696
CONFIG_IP_PNP_RARP=y
9797
CONFIG_NETFILTER=y
98+
CONFIG_BRIDGE=m
99+
CONFIG_BRIDGE_VLAN_FILTERING=y
100+
CONFIG_VLAN_8021Q=m
98101
CONFIG_PHONET=m
102+
CONFIG_NET_SCHED=y
103+
CONFIG_NET_SCH_INGRESS=m
104+
CONFIG_NET_CLS_U32=m
105+
CONFIG_NET_CLS_FLOWER=m
106+
CONFIG_NET_CLS_MATCHALL=m
107+
CONFIG_NET_CLS_ACT=y
108+
CONFIG_NET_ACT_POLICE=m
109+
CONFIG_NET_ACT_GACT=m
99110
CONFIG_NET_SWITCHDEV=y
100111
CONFIG_CAN=m
101112
CONFIG_CAN_C_CAN=m
@@ -510,6 +521,7 @@ CONFIG_IIO_ST_ACCEL_3AXIS=m
510521
CONFIG_CPCAP_ADC=m
511522
CONFIG_INA2XX_ADC=m
512523
CONFIG_TI_AM335X_ADC=m
524+
CONFIG_TWL4030_MADC=m
513525
CONFIG_SENSORS_ISL29028=m
514526
CONFIG_BMP280=m
515527
CONFIG_PWM=y

0 commit comments

Comments
 (0)