diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 23:18:56 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 23:18:56 +0000 |
commit | 4d657aa39d5bcae60c2c11bf8fb66692ddd1c9e7 (patch) | |
tree | 30f3b08741a4d4b98b16bd99ea2757ff715d1c11 /arch/mips/defconfig-cobalt | |
parent | eed6b7c84cc33f229f6fecd884d9a22af5bec514 (diff) |
Merge with 2.4.0-test5 final.
Diffstat (limited to 'arch/mips/defconfig-cobalt')
-rw-r--r-- | arch/mips/defconfig-cobalt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/defconfig-cobalt b/arch/mips/defconfig-cobalt index bfef9e3a0..01661a95d 100644 --- a/arch/mips/defconfig-cobalt +++ b/arch/mips/defconfig-cobalt @@ -447,8 +447,8 @@ CONFIG_RTC=y # Ftape, the floppy tape device driver # # CONFIG_FTAPE is not set -# CONFIG_DRM is not set # CONFIG_AGP is not set +# CONFIG_DRM is not set # # File systems |