diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/mips/config.in | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/config.in')
| -rw-r--r-- | arch/mips/config.in | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in index 9a1d95025..1757a9290 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -1,4 +1,4 @@ -# $Id: config.in,v 1.30 1999/08/20 21:59:01 ralf Exp $ +# $Id: config.in,v 1.31 1999/09/28 22:25:44 ralf Exp $ # For a description of the syntax of this configuration file, # see the Configure script. # @@ -26,6 +26,7 @@ bool 'Support for SNI RM200 PCI' CONFIG_SNI_RM200_PCI # Select some configuration options automatically for certain systems. # unset CONFIG_PCI +unset CONFIG_ISA unset CONFIG_MIPS_JAZZ unset CONFIG_VIDEO_G364 @@ -34,14 +35,17 @@ if [ "$CONFIG_ALGOR_P4032" = "y" ]; then fi if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o \ "$CONFIG_OLIVETTI_M700" = "y" ]; then + define_bool CONFIG_ISA y define_bool CONFIG_MIPS_JAZZ y define_bool CONFIG_FB y define_bool CONFIG_FB_G364 y fi if [ "$CONFIG_ACER_PICA_61" = "y" ]; then + define_bool CONFIG_ISA y define_bool CONFIG_MIPS_JAZZ y fi if [ "$CONFIG_SNI_RM200_PCI" = "y" ]; then + define_bool CONFIG_ISA y define_bool CONFIG_PCI y fi endmenu @@ -92,14 +96,6 @@ endmenu mainmenu_option next_comment comment 'General setup' -if [ "$CONFIG_PCI" = "y" ]; then - bool ' PCI quirks' CONFIG_PCI_QUIRKS - if [ "$CONFIG_PCI_QUIRKS" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then - bool ' PCI bridge optimization (experimental)' CONFIG_PCI_OPTIMIZE - fi - bool ' Backward-compatible /proc/pci' CONFIG_PCI_OLD_PROC -fi - if [ "$CONFIG_DECSTATION" = "y" ]; then define_bool CONFIG_CPU_LITTLE_ENDIAN y else @@ -123,7 +119,7 @@ bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL if [ "$CONFIG_SGI_IP22" != "y" -a "$CONFIG_DECSTATION" != "y" -a "$CONFIG_BAGET_MIPS" != "y" ]; then - source drivers/misc/Config.in + source drivers/parport/Config.in fi endmenu @@ -205,6 +201,9 @@ if [ "$CONFIG_NET" = "y" ]; then if [ "$CONFIG_NETDEVICES" = "y" ]; then if [ "$CONFIG_SGI_IP22" != "y" -a "$CONFIG_DECSTATION" != "y" -a "$CONFIG_BAGET_MIPS" != "y" ]; then source drivers/net/Config.in + if [ "$CONFIG_ATM" = "y" ]; then + source drivers/atm/Config.in + fi else tristate 'Dummy net driver support' CONFIG_DUMMY tristate 'SLIP (serial line) support' CONFIG_SLIP @@ -218,7 +217,7 @@ if [ "$CONFIG_NET" = "y" ]; then fi if [ "$CONFIG_SGI_IP22" = "y" ]; then bool 'SGI Seeq ethernet controller support' CONFIG_SGISEEQ - fi + fi if [ "$CONFIG_DECSTATION" = "y" ]; then bool 'DEC LANCE ethernet controller support' CONFIG_DECLANCE fi @@ -290,6 +289,8 @@ fi source drivers/usb/Config.in +source drivers/misc/Config.in + source fs/Config.in if [ "$CONFIG_VT" = "y" ]; then |