summaryrefslogtreecommitdiffstats
path: root/arch/mips/defconfig-orion
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-07-23 14:05:01 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-07-23 14:05:01 +0000
commitf3627cbe9236a062012c836f3b6ee311b43f63f2 (patch)
treeae854838b9a73b35bd0f3b8f42e5fb7f9cb1d5a9 /arch/mips/defconfig-orion
parentfea12a7b3f20bc135ab533491411e9ff753c01c8 (diff)
Merge with Linux 2.4.0-test5-pre4.
Diffstat (limited to 'arch/mips/defconfig-orion')
-rw-r--r--arch/mips/defconfig-orion1
1 files changed, 0 insertions, 1 deletions
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
#