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/mips64 | |
| parent | eed6b7c84cc33f229f6fecd884d9a22af5bec514 (diff) | |
Merge with 2.4.0-test5 final.
Diffstat (limited to 'arch/mips64')
| -rw-r--r-- | arch/mips64/defconfig | 2 | ||||
| -rw-r--r-- | arch/mips64/defconfig-ip22 | 2 | ||||
| -rw-r--r-- | arch/mips64/defconfig-ip27 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig index aa9fdef16..12937f110 100644 --- a/arch/mips64/defconfig +++ b/arch/mips64/defconfig @@ -326,8 +326,8 @@ CONFIG_SERIAL_CONSOLE=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 diff --git a/arch/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22 index 6c2835d21..497b54e17 100644 --- a/arch/mips64/defconfig-ip22 +++ b/arch/mips64/defconfig-ip22 @@ -245,8 +245,8 @@ CONFIG_VT_CONSOLE=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 diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27 index aa9fdef16..12937f110 100644 --- a/arch/mips64/defconfig-ip27 +++ b/arch/mips64/defconfig-ip27 @@ -326,8 +326,8 @@ CONFIG_SERIAL_CONSOLE=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 |