diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
| commit | f3627cbe9236a062012c836f3b6ee311b43f63f2 (patch) | |
| tree | ae854838b9a73b35bd0f3b8f42e5fb7f9cb1d5a9 /arch/mips | |
| parent | fea12a7b3f20bc135ab533491411e9ff753c01c8 (diff) | |
Merge with Linux 2.4.0-test5-pre4.
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/defconfig-cobalt | 1 | ||||
| -rw-r--r-- | arch/mips/defconfig-orion | 1 | ||||
| -rw-r--r-- | arch/mips/defconfig-rm200 | 1 |
3 files changed, 0 insertions, 3 deletions
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 # |