summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2017-06-08 17:41:38 +0300
committerKrzysztof Kozlowski <krzk@kernel.org>2017-06-10 20:29:56 +0300
commitc5f6fc414968d35acadd48f2402d8dae86be1784 (patch)
treea0a060b6fe31d23c19c53901557ea997a26f9652 /arch/arm
parent2a7ae1c04983e5e1fd25baacce25562931893852 (diff)
downloadlinux-c5f6fc414968d35acadd48f2402d8dae86be1784.tar.xz
ARM: mini2440_defconfig: Bring back lost (but wanted) options
The config was not updated for some time so it needs updates to get the same options as wanted initially: - SERIAL_DEV_BUS is now needed for BT_HCIUART_LL; - USB_GADGET_S3C2410 was replaced by USB_S3C2410; - S3C24XX_DMAC is now needed for MMC_S3C; Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/mini2440_defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig
index e621032ab1f0..45ce98d5392d 100644
--- a/arch/arm/configs/mini2440_defconfig
+++ b/arch/arm/configs/mini2440_defconfig
@@ -145,6 +145,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_LEGACY_PTY_COUNT=128
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_DEV_BUS=m
CONFIG_IPMI_HANDLER=m
CONFIG_IPMI_DEVICE_INTERFACE=m
CONFIG_IPMI_SI=m
@@ -225,7 +226,7 @@ CONFIG_USB_SERIAL_CP210X=m
CONFIG_USB_SERIAL_FTDI_SIO=m
CONFIG_USB_SERIAL_SPCP8X5=m
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_S3C2410=y
+CONFIG_USB_S3C2410=y
CONFIG_USB_ZERO=m
CONFIG_USB_ETH=m
CONFIG_USB_GADGETFS=m
@@ -248,6 +249,7 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_S3C=y
CONFIG_DMADEVICES=y
+CONFIG_S3C24XX_DMAC=y
CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y