diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /arch/arm/defconfig | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'arch/arm/defconfig')
| -rw-r--r-- | arch/arm/defconfig | 2 |
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 |