summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-21 00:50:07 -0800
committerOlof Johansson <olof@lixom.net>2012-11-21 02:13:10 -0800
commitf86804af89686562fdeeabbdc0dfc6db9397f202 (patch)
treef007aa12adbb85e8762af4caab82f2fd3ccbf1e3 /arch/arm/configs
parentea091f6dbd2e5df03b6bbb11467c553ebedd16a2 (diff)
parenta6380c13c112af5122b8284c8cf1ec09aacae81d (diff)
Merge tag 'bcm2835-for-3.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/soc
From Stephen Warren: ARM: bcm2835: defconfig updates procfs and sysfs are enabled in bcm2835_defconfig. * tag 'bcm2835-for-3.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi: ARM: bcm2835: enable procfs and sysfs in defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/bcm2835_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig
index 7aea70253c63..74e27f0ff6ad 100644
--- a/arch/arm/configs/bcm2835_defconfig
+++ b/arch/arm/configs/bcm2835_defconfig
@@ -66,8 +66,6 @@ CONFIG_TTY_PRINTK=y
# CONFIG_FILE_LOCKING is not set
# CONFIG_DNOTIFY is not set
# CONFIG_INOTIFY_USER is not set
-# CONFIG_PROC_FS is not set
-# CONFIG_SYSFS is not set
# CONFIG_MISC_FILESYSTEMS is not set
CONFIG_PRINTK_TIME=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set