diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /arch/mips64/config.in | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'arch/mips64/config.in')
| -rw-r--r-- | arch/mips64/config.in | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/arch/mips64/config.in b/arch/mips64/config.in index 937b9b708..7f22687c8 100644 --- a/arch/mips64/config.in +++ b/arch/mips64/config.in @@ -1,4 +1,4 @@ -# $Id: config.in,v 1.18 2000/03/26 23:46:56 ralf Exp $ +# $Id: config.in,v 1.19 2000/03/27 01:44:45 ralf Exp $ # # For a description of the syntax of this configuration file, # see the Configure script. @@ -27,13 +27,12 @@ endmenu # unset CONFIG_ARC32 unset CONFIG_ARC64 +unset CONFIG_BINFMT_ELF32 +unset CONFIG_BOARD_SCACHE unset CONFIG_BOOT_ELF32 unset CONFIG_BOOT_ELF64 -unset CONFIG_ARC32 -unset CONFIG_ARC64 -unset CONFIG_BOARD_SCACHE unset CONFIG_COHERENT_IO -unset CONFIG_BINFMT_ELF32 +unset CONFIG_ISA unset CONFIG_PCI if [ "$CONFIG_SGI_IP22" = "y" ]; then @@ -51,6 +50,14 @@ if [ "$CONFIG_SGI_IP27" = "y" ]; then define_bool CONFIG_QL_ISP_A64 y fi +if [ "$CONFIG_ISA" != "y" ]; then + define_bool CONFIG_ISA n +fi + +if [ "$CONFIG_PCI" != "y" ]; then + define_bool CONFIG_PCI n +fi + mainmenu_option next_comment comment 'CPU selection' |