Skip to content

Commit 66fa76a

Browse files
committed
Merge tag 'samsung-defconfig-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/defconfig
Samsung defconfig changes for v5.8 1. Enable drivers for Exynos3250 Rinato Bluetooth, 2. Build WiFi mac80211 framework as module so it will get loaded the same time as regulatory data. * tag 'samsung-defconfig-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: exynos_defconfig: Compile MAC80211/CFG80211 as modules ARM: exynos_defconfig: Enable serial bus and BCM HCIUART drivers Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 016eae2 + a836072 commit 66fa76a

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

arch/arm/configs/exynos_defconfig

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ CONFIG_BT_HCIUART=m
6969
CONFIG_BT_HCIUART_BCSP=y
7070
CONFIG_BT_HCIUART_ATH3K=y
7171
CONFIG_BT_HCIUART_INTEL=y
72+
CONFIG_BT_HCIUART_BCM=y
7273
CONFIG_BT_HCIUART_AG6XX=y
7374
CONFIG_BT_HCIUART_MRVL=y
7475
CONFIG_BT_HCIBCM203X=m
@@ -78,8 +79,8 @@ CONFIG_BT_HCIVHCI=m
7879
CONFIG_BT_MRVL=m
7980
CONFIG_BT_MRVL_SDIO=m
8081
CONFIG_BT_ATH3K=m
81-
CONFIG_CFG80211=y
82-
CONFIG_MAC80211=y
82+
CONFIG_CFG80211=m
83+
CONFIG_MAC80211=m
8384
CONFIG_MAC80211_LEDS=y
8485
CONFIG_NFC=y
8586
CONFIG_NFC_DIGITAL=m
@@ -94,7 +95,7 @@ CONFIG_DEVTMPFS_MOUNT=y
9495
CONFIG_BLK_DEV_LOOP=y
9596
CONFIG_BLK_DEV_CRYPTOLOOP=y
9697
CONFIG_BLK_DEV_RAM=y
97-
CONFIG_BLK_DEV_RAM_SIZE=32768
98+
CONFIG_BLK_DEV_RAM_SIZE=65536
9899
CONFIG_SCSI=y
99100
CONFIG_BLK_DEV_SD=y
100101
CONFIG_CHR_DEV_SG=y
@@ -133,6 +134,7 @@ CONFIG_SERIAL_8250=y
133134
CONFIG_SERIAL_OF_PLATFORM=y
134135
CONFIG_SERIAL_SAMSUNG=y
135136
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
137+
CONFIG_SERIAL_DEV_BUS=y
136138
CONFIG_HW_RANDOM=y
137139
CONFIG_TCG_TPM=y
138140
CONFIG_TCG_TIS_I2C_INFINEON=y

0 commit comments

Comments
 (0)