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/sparc/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/sparc/config.in')
| -rw-r--r-- | arch/sparc/config.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/sparc/config.in b/arch/sparc/config.in index e3aaea31c..97c970481 100644 --- a/arch/sparc/config.in +++ b/arch/sparc/config.in @@ -1,4 +1,4 @@ -# $Id: config.in,v 1.58 1998/07/29 05:06:41 davem Exp $ +# $Id: config.in,v 1.63 1998/09/21 05:05:56 jj Exp $ # For a description of the syntax of this configuration file, # see the Configure script. # @@ -35,6 +35,9 @@ if [ "$CONFIG_AP1000" = "y" ]; then tristate 'OPIU DDV Driver' CONFIG_DDV else bool 'Support for SUN4 machines (disables SUN4[CDM] support)' CONFIG_SUN4 + if [ "$CONFIG_SUN4" != "y" ]; then + bool 'Support for PCI and PS/2 keyboard/mouse' CONFIG_PCI + fi mainmenu_option next_comment comment 'Console drivers' @@ -54,9 +57,7 @@ else define_bool CONFIG_SUN_CONSOLE y define_bool CONFIG_SUN_AUXIO y define_bool CONFIG_SUN_IO y - if [ "$CONFIG_SUN4" = "y" ]; then - bool 'Force early PROM Console' CONFIG_SUN4_FORCECONSOLE - else + if [ "$CONFIG_SUN4" != "y" ]; then source drivers/sbus/char/Config.in source drivers/sbus/audio/Config.in fi |