diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /arch/sparc64/config.in | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'arch/sparc64/config.in')
| -rw-r--r-- | arch/sparc64/config.in | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/sparc64/config.in b/arch/sparc64/config.in index 2caead01d..103767d64 100644 --- a/arch/sparc64/config.in +++ b/arch/sparc64/config.in @@ -1,4 +1,4 @@ -# $Id: config.in,v 1.55 1998/08/03 15:28:38 davem Exp $ +# $Id: config.in,v 1.58 1998/11/16 04:47:30 davem Exp $ # For a description of the syntax of this configuration file, # see the Configure script. # @@ -51,14 +51,15 @@ else define_bool CONFIG_SUN_CONSOLE y define_bool CONFIG_SUN_AUXIO y define_bool CONFIG_SUN_IO y - define_bool CONFIG_PCI y - define_bool CONFIG_PCI_CONSOLE y + bool 'PCI support' CONFIG_PCI source drivers/sbus/char/Config.in source drivers/sbus/audio/Config.in fi tristate 'Openprom tree appears in /proc/openprom (EXPERIMENTAL)' CONFIG_SUN_OPENPROMFS -bool 'Backward-compatible /proc/pci' CONFIG_PCI_OLD_PROC +if [ "$CONFIG_PCI" = "y" ]; then + bool 'Backward-compatible /proc/pci' CONFIG_PCI_OLD_PROC +fi bool 'Networking support' CONFIG_NET bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT @@ -223,7 +224,10 @@ if [ "$CONFIG_NET" = "y" ]; then tristate 'MyriCOM Gigabit Ethernet support' CONFIG_MYRI_SBUS if [ "$CONFIG_PCI" = "y" ]; then tristate 'Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5 - tristate '3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX +# Turned off until updated 3c59x.c driver +# gets approved by Linus... --DAVEM +# +# tristate '3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX fi # bool 'FDDI driver support' CONFIG_FDDI # if [ "$CONFIG_FDDI" = "y" ]; then @@ -246,5 +250,5 @@ mainmenu_option next_comment comment 'Kernel hacking' bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ -bool 'ECache flush trap support at ta 0x72' CONFIG_EC_FLUSH_TRAP +#bool 'ECache flush trap support at ta 0x72' CONFIG_EC_FLUSH_TRAP endmenu |