diff options
| -rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index e347de134670..49a0deae5e5b 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig | |||
| @@ -678,6 +678,7 @@ CONFIG_BT_HIDP=m | |||
| 678 | # Bluetooth device drivers | 678 | # Bluetooth device drivers |
| 679 | # | 679 | # |
| 680 | # CONFIG_BT_HCIBTUSB is not set | 680 | # CONFIG_BT_HCIBTUSB is not set |
| 681 | # CONFIG_BT_HCIBTSDIO is not set | ||
| 681 | CONFIG_BT_HCIUART=m | 682 | CONFIG_BT_HCIUART=m |
| 682 | CONFIG_BT_HCIUART_H4=y | 683 | CONFIG_BT_HCIUART_H4=y |
| 683 | CONFIG_BT_HCIUART_BCSP=y | 684 | CONFIG_BT_HCIUART_BCSP=y |
| @@ -1596,7 +1597,24 @@ CONFIG_USB_LD=m | |||
| 1596 | # | 1597 | # |
| 1597 | # CONFIG_USB_GPIO_VBUS is not set | 1598 | # CONFIG_USB_GPIO_VBUS is not set |
| 1598 | # CONFIG_NOP_USB_XCEIV is not set | 1599 | # CONFIG_NOP_USB_XCEIV is not set |
| 1599 | # CONFIG_MMC is not set | 1600 | CONFIG_MMC=y |
| 1601 | # CONFIG_MMC_DEBUG is not set | ||
| 1602 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 1603 | |||
| 1604 | # | ||
| 1605 | # MMC/SD/SDIO Card Drivers | ||
| 1606 | # | ||
| 1607 | CONFIG_MMC_BLOCK=y | ||
| 1608 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 1609 | CONFIG_SDIO_UART=m | ||
| 1610 | CONFIG_MMC_TEST=m | ||
| 1611 | |||
| 1612 | # | ||
| 1613 | # MMC/SD/SDIO Host Controller Drivers | ||
| 1614 | # | ||
| 1615 | CONFIG_MMC_SDHCI=m | ||
| 1616 | CONFIG_MMC_SPI=m | ||
| 1617 | CONFIG_MMC_S3C=y | ||
| 1600 | # CONFIG_MEMSTICK is not set | 1618 | # CONFIG_MEMSTICK is not set |
| 1601 | # CONFIG_ACCESSIBILITY is not set | 1619 | # CONFIG_ACCESSIBILITY is not set |
| 1602 | CONFIG_NEW_LEDS=y | 1620 | CONFIG_NEW_LEDS=y |
| @@ -2075,7 +2093,7 @@ CONFIG_GENERIC_FIND_LAST_BIT=y | |||
| 2075 | # CONFIG_CRC_T10DIF is not set | 2093 | # CONFIG_CRC_T10DIF is not set |
| 2076 | CONFIG_CRC_ITU_T=m | 2094 | CONFIG_CRC_ITU_T=m |
| 2077 | CONFIG_CRC32=y | 2095 | CONFIG_CRC32=y |
| 2078 | # CONFIG_CRC7 is not set | 2096 | CONFIG_CRC7=m |
| 2079 | CONFIG_LIBCRC32C=m | 2097 | CONFIG_LIBCRC32C=m |
| 2080 | CONFIG_ZLIB_INFLATE=y | 2098 | CONFIG_ZLIB_INFLATE=y |
| 2081 | CONFIG_ZLIB_DEFLATE=y | 2099 | CONFIG_ZLIB_DEFLATE=y |
