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/mips/config.in | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'arch/mips/config.in')
| -rw-r--r-- | arch/mips/config.in | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in index 14a62ac8f..7a400b3e0 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -1,4 +1,4 @@ -# $Id: config.in,v 1.45 2000/03/19 01:28:43 ralf Exp $ +# $Id: config.in,v 1.46 2000/03/26 22:59:01 ralf Exp $ # For a description of the syntax of this configuration file, # see the Configure script. # @@ -38,15 +38,13 @@ fi if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o \ "$CONFIG_OLIVETTI_M700" = "y" ]; then define_bool CONFIG_ARC32 y - define_bool CONFIG_ISA y define_bool CONFIG_HAVE_IO_PORTS y - define_bool CONFIG_MIPS_JAZZ y define_bool CONFIG_FB y define_bool CONFIG_FB_G364 y + define_bool CONFIG_MIPS_JAZZ y fi if [ "$CONFIG_ACER_PICA_61" = "y" ]; then define_bool CONFIG_ARC32 y - define_bool CONFIG_ISA y define_bool CONFIG_HAVE_IO_PORTS y define_bool CONFIG_MIPS_JAZZ y fi @@ -55,14 +53,19 @@ if [ "$CONFIG_SGI_IP22" = "y" ]; then fi if [ "$CONFIG_SNI_RM200_PCI" = "y" ]; then define_bool CONFIG_ARC32 y - define_bool CONFIG_ISA y define_bool CONFIG_HAVE_IO_PORTS y - define_bool CONFIG_PCI y fi if [ "$CONFIG_DDB5074" = "y" ]; then - define_bool CONFIG_PCI y define_bool CONFIG_HAVE_IO_PORTS y fi + +if [ "$CONFIG_ISA" != "y" ]; then + define_bool CONFIG_ISA n +fi + +if [ "$CONFIG_PCI" != "y" ]; then + define_bool CONFIG_PCI n +fi endmenu mainmenu_option next_comment |