Skip to content

Commit 6daf99a

Browse files
committed
Merge branch 'linux-5.15-trunk/at91/config' into linux-5.15-mchp
2 parents 3d15d1f + 6727f8f commit 6daf99a

3 files changed

Lines changed: 3 additions & 0 deletions

File tree

arch/arm/configs/at91_dt_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ CONFIG_USB_ETH=m
199199
CONFIG_USB_MASS_STORAGE=m
200200
CONFIG_USB_G_SERIAL=m
201201
CONFIG_MMC=y
202+
CONFIG_PWRSEQ_SD8787=m
202203
CONFIG_MMC_SDHCI=y
203204
CONFIG_MMC_SDHCI_PLTFM=y
204205
CONFIG_MMC_SDHCI_OF_AT91=y

arch/arm/configs/sama5_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ CONFIG_USB_ETH=m
263263
CONFIG_USB_MASS_STORAGE=m
264264
CONFIG_USB_G_SERIAL=m
265265
CONFIG_MMC=y
266+
CONFIG_PWRSEQ_SD8787=m
266267
CONFIG_MMC_SDHCI=y
267268
CONFIG_MMC_SDHCI_PLTFM=y
268269
CONFIG_MMC_SDHCI_OF_AT91=y

arch/arm/configs/sama7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ CONFIG_USB_ETH=m
199199
CONFIG_USB_MASS_STORAGE=m
200200
CONFIG_USB_G_SERIAL=m
201201
CONFIG_MMC=y
202+
CONFIG_PWRSEQ_SD8787=m
202203
CONFIG_MMC_SDHCI=y
203204
CONFIG_MMC_SDHCI_PLTFM=y
204205
CONFIG_MMC_SDHCI_OF_AT91=y

0 commit comments

Comments
 (0)