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/mips64/defconfig | 2 +- arch/mips64/defconfig-ip22 | 2 +- arch/mips64/defconfig-ip27 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/mips64') diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig index 3af288cff..aa9fdef16 100644 --- a/arch/mips64/defconfig +++ b/arch/mips64/defconfig @@ -327,7 +327,7 @@ CONFIG_SERIAL_CONSOLE=y # # CONFIG_FTAPE is not set # CONFIG_DRM is not set -# CONFIG_DRM_TDFX is not set +# CONFIG_AGP is not set # # File systems diff --git a/arch/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22 index a40dc4eb0..6c2835d21 100644 --- a/arch/mips64/defconfig-ip22 +++ b/arch/mips64/defconfig-ip22 @@ -246,7 +246,7 @@ CONFIG_VT_CONSOLE=y # # CONFIG_FTAPE is not set # CONFIG_DRM is not set -# CONFIG_DRM_TDFX is not set +# CONFIG_AGP is not set # # File systems diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27 index 3af288cff..aa9fdef16 100644 --- a/arch/mips64/defconfig-ip27 +++ b/arch/mips64/defconfig-ip27 @@ -327,7 +327,7 @@ CONFIG_SERIAL_CONSOLE=y # # CONFIG_FTAPE is not set # CONFIG_DRM is not set -# CONFIG_DRM_TDFX is not set +# CONFIG_AGP is not set # # File systems -- cgit v1.2.3