Skip to content

Commit 4af334b

Browse files
committed
Merge branch 'linux-5.15-trunk/at91/config' into linux-5.15-mchp
2 parents 59892dd + 4f091f0 commit 4af334b

3 files changed

Lines changed: 0 additions & 3 deletions

File tree

arch/arm/configs/at91_dt_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ 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
203202
CONFIG_MMC_SDHCI=y
204203
CONFIG_MMC_SDHCI_PLTFM=y
205204
CONFIG_MMC_SDHCI_OF_AT91=y

arch/arm/configs/sama5_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ 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
267266
CONFIG_MMC_SDHCI=y
268267
CONFIG_MMC_SDHCI_PLTFM=y
269268
CONFIG_MMC_SDHCI_OF_AT91=y

arch/arm/configs/sama7_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ CONFIG_USB_CONFIGFS_MASS_STORAGE=y
193193
CONFIG_USB_CONFIGFS_F_UVC=y
194194
CONFIG_USB_G_SERIAL=m
195195
CONFIG_MMC=y
196-
CONFIG_PWRSEQ_SD8787=m
197196
CONFIG_MMC_SDHCI=y
198197
CONFIG_MMC_SDHCI_PLTFM=y
199198
CONFIG_MMC_SDHCI_OF_AT91=y

0 commit comments

Comments
 (0)