- Delete MTK_PMIC_WRAP added twice.

- Set MMC_MTK as built-in to be able to boot from MMC device.
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCAA1FiEEUdvKHhzqrUYPB/u8L21+TfbCqH4FAmDDNmUXHG1hdHRoaWFz
 LmJnZ0BnbWFpbC5jb20ACgkQL21+TfbCqH6rehAAtAdaEHTBnYGhmRrgZZZigT5d
 237SaFWne4bnePDd6hpoU44bpqxn7x8pVPXMLEZeeJwam4y5wfGs3lYeDZ8n/FG9
 7g7oLKRjhsyI2skf5TJtk/lzsuRU1Ahr8pY4oypnd+irForwvxWD3mFTc7QjbGXJ
 Z/05TNjBbHXUgtRPqKjs/WIjxKFIba1yWSGjRjD3xowl2zkhlyyfXyhWXl29kFE+
 Ynd3VYVchfznqDV5yk/8+cjUFZjerxFIr9Ztz9fpAQDKJ6Ll9WZ8d18S/JtGc+bT
 Vua0iLxnek0bgIfwxmmNlwP0j5Mz6Q5p2mYHWcrpUm3MEB8I77IUjg32WQL1WSey
 U3de+GsDVtqGfCYDIM7FXYZfxabU4CyvzKhh2UnypdRiakH4kVfZszngPWDC1rK9
 5Jqgu8mjFFtHINn25ud5ONFVBq2E58xJIKbxiopK6slc5jDYbZscYhzgnPrr9lfK
 3AScENfxW3NBb96Ca2LV3tTTaWfXj6MOExFqxYj3J9fQOEsK9/DxJSH0ZrhgsV/j
 l+hRQE3CzKA0Yw3m6GHlXjiUCdieIm2zMKK7G7YOVZDBWTk7o2y+fPoh8TEgtbue
 jYSaY/MXRJ6GokQxEi1INBgCiiweKZ90XvdtQF6wleEFQ73mM56zpRlKgV+mKcrU
 t3XTWoJys+MVIzo9zrs=
 =MS0W
 -----END PGP SIGNATURE-----

Merge tag 'v5.13-next-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/defconfig

- Delete MTK_PMIC_WRAP added twice.
- Set MMC_MTK as built-in to be able to boot from MMC device.

* tag 'v5.13-next-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm64: defconfig: Allow Mediatek boards to boot from the mmc
  arm64: defconfig: Do not override the MTK_PMIC_WRAP symbol

Link: https://lore.kernel.org/r/ad6f7f4e-7e4d-08b9-8781-71bd78444929@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm64/configs/defconfig

@@ -491,7 +491,6 @@ CONFIG_SPI_S3C64XX=y
 CONFIG_SPI_SH_MSIOF=m
 CONFIG_SPI_SUN6I=y
 CONFIG_SPI_SPIDEV=m
-CONFIG_MTK_PMIC_WRAP=m
 CONFIG_SPMI=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_MAX77620=y
@@ -866,6 +865,7 @@ CONFIG_MMC_DW_K3=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SUNXI=y
 CONFIG_MMC_BCM2835=y
+CONFIG_MMC_MTK=y
 CONFIG_MMC_SDHCI_XENON=y
 CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MMC_OWL=y