summaryrefslogtreecommitdiffstats
path: root/arch/arm/defconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/defconfig')
-rw-r--r--arch/arm/defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/defconfig b/arch/arm/defconfig
index 5e587ffbf..64fb0d7ab 100644
--- a/arch/arm/defconfig
+++ b/arch/arm/defconfig
@@ -172,7 +172,6 @@ CONFIG_PPP=m
CONFIG_ETHER1=m
CONFIG_ETHER3=m
CONFIG_ETHERH=m
-CONFIG_CDROM=y
#
# Filesystems
@@ -264,5 +263,4 @@ DSP_BUFFSIZE=65536
#
# Kernel hacking
#
-# CONFIG_PROFILE is not set
CONFIG_MAGIC_SYSRQ=y