diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:05:57 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:05:57 +0000 |
| commit | 51d3b7814cdccef9188240fe0cbd8d97ff2c7470 (patch) | |
| tree | 5cbb01d0323d4f63ade66bdf48ba4a91aaa6df16 /arch/mips/defconfig | |
| parent | 52273a23c9a84336b93a35e4847fc88fac7eb0e4 (diff) | |
Merge with Linux 2.3.7.
WARNING: 2.3.7 is known to eat filesystems for breakfast and little
children for lunch, so if you try this on your machine make backups
first ...
Diffstat (limited to 'arch/mips/defconfig')
| -rw-r--r-- | arch/mips/defconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index a476aeb87..80285f390 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -376,10 +376,6 @@ CONFIG_NLS_KOI8_R=m # CONFIG_VGA_CONSOLE=y # CONFIG_FB is not set -# CONFIG_FBCON_FONTWIDTH8_ONLY is not set -# CONFIG_FBCON_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y # # Sound @@ -391,4 +387,5 @@ CONFIG_FONT_8x16=y # # CONFIG_CROSSCOMPILE is not set # CONFIG_MIPS_FPE_MODULE is not set +# CONFIG_REMOTE_DEBUG is not set # CONFIG_MAGIC_SYSRQ is not set |