summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2017-06-08 16:41:45 +0200
committerKrzysztof Kozlowski <krzk@kernel.org>2017-06-10 19:30:04 +0200
commit61d26c612d07c75bef9d737d8da890243671ee2b (patch)
tree627e20140f878aa381cace97586a1c4ec137e285 /arch/arm/configs
parentARM: s3c2410_defconfig: Bring back lost (but wanted) options (diff)
downloadlinux-61d26c612d07c75bef9d737d8da890243671ee2b.tar.xz
linux-61d26c612d07c75bef9d737d8da890243671ee2b.zip
ARM: s3c6400_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: - SYSFS_DEPRECATED is now needed for SYSFS_DEPRECATED_V2; - PWM is now needed for BACKLIGHT_PWM; - DEBUG_SPINLOCK_SLEEP was replaced by DEBUG_ATOMIC_SLEEP; Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/s3c6400_defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig
index 97e377a4c118..8979e343d255 100644
--- a/arch/arm/configs/s3c6400_defconfig
+++ b/arch/arm/configs/s3c6400_defconfig
@@ -1,3 +1,4 @@
+CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_KALLSYMS_ALL=y
@@ -72,6 +73,7 @@ CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_S3C=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_S3C=y
+CONFIG_PWM=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
@@ -86,6 +88,6 @@ CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_RT_MUTEXES=y
CONFIG_DEBUG_SPINLOCK=y
CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
CONFIG_DEBUG_USER=y
CONFIG_DEBUG_LL=y