From f3627cbe9236a062012c836f3b6ee311b43f63f2 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sun, 23 Jul 2000 14:05:01 +0000 Subject: Merge with Linux 2.4.0-test5-pre4. --- arch/mips/defconfig-cobalt | 1 - arch/mips/defconfig-orion | 1 - arch/mips/defconfig-rm200 | 1 - 3 files changed, 3 deletions(-) (limited to 'arch/mips') diff --git a/arch/mips/defconfig-cobalt b/arch/mips/defconfig-cobalt index dc709bf16..bfef9e3a0 100644 --- a/arch/mips/defconfig-cobalt +++ b/arch/mips/defconfig-cobalt @@ -448,7 +448,6 @@ CONFIG_RTC=y # # CONFIG_FTAPE is not set # CONFIG_DRM is not set -# CONFIG_DRM_TDFX is not set # CONFIG_AGP is not set # diff --git a/arch/mips/defconfig-orion b/arch/mips/defconfig-orion index d9a78da25..e45b978b4 100644 --- a/arch/mips/defconfig-orion +++ b/arch/mips/defconfig-orion @@ -203,7 +203,6 @@ CONFIG_BLK_DEV_INITRD=y # # CONFIG_FTAPE is not set # CONFIG_DRM is not set -# CONFIG_DRM_TDFX is not set # CONFIG_AGP is not set # diff --git a/arch/mips/defconfig-rm200 b/arch/mips/defconfig-rm200 index 5b71797a8..f67154e91 100644 --- a/arch/mips/defconfig-rm200 +++ b/arch/mips/defconfig-rm200 @@ -234,7 +234,6 @@ CONFIG_RTC=y # # CONFIG_FTAPE is not set # CONFIG_DRM is not set -# CONFIG_DRM_TDFX is not set # CONFIG_AGP is not set # -- cgit v1.2.3