]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: s3c6400_defconfig: Bring back lost (but wanted) options
authorKrzysztof Kozlowski <krzk@kernel.org>
Thu, 8 Jun 2017 14:41:45 +0000 (16:41 +0200)
committerKrzysztof Kozlowski <krzk@kernel.org>
Sat, 10 Jun 2017 17:30:04 +0000 (19:30 +0200)
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>
arch/arm/configs/s3c6400_defconfig

index 97e377a4c1185613f8da6f86c73516b66b9ffe0f..8979e343d255e39d7b9b225aa866807bf6b396c4 100644 (file)
@@ -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