diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /arch/sparc/config.in | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'arch/sparc/config.in')
| -rw-r--r-- | arch/sparc/config.in | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/arch/sparc/config.in b/arch/sparc/config.in index 4a087fca2..3f0ab09b6 100644 --- a/arch/sparc/config.in +++ b/arch/sparc/config.in @@ -1,4 +1,4 @@ -# $Id: config.in,v 1.51 1998/01/08 04:16:54 baccala Exp $ +# $Id: config.in,v 1.54 1998/03/27 06:59:39 davem Exp $ # For a description of the syntax of this configuration file, # see the Configure script. # @@ -34,6 +34,8 @@ if [ "$CONFIG_AP1000" = "y" ]; then define_bool CONFIG_APBIF y tristate 'OPIU DDV Driver' CONFIG_DDV else + bool 'Support for SUN4 machines (disables SUN4[CDM] support)' CONFIG_SUN4 + # Global things across all Sun machines. define_bool CONFIG_SBUS y define_bool CONFIG_SBUSCHAR y @@ -45,8 +47,13 @@ else define_bool CONFIG_SUN_CONSOLE y define_bool CONFIG_SUN_AUXIO y define_bool CONFIG_SUN_IO y - source drivers/sbus/char/Config.in - source drivers/sbus/audio/Config.in + if [ "$CONFIG_SUN4" = "y" ]; then + bool 'Sun FB drivers appear in PROCFS' SUN_FBS_IN_PROCFS + bool 'bwtwo support' SUN_FB_BWTWO + else + source drivers/sbus/char/Config.in + source drivers/sbus/audio/Config.in + fi fi tristate 'Openprom tree appears in /proc/openprom (EXPERIMENTAL)' CONFIG_SUN_OPENPROMFS @@ -159,17 +166,6 @@ if [ "$CONFIG_NET" = "y" ]; then endmenu fi -# Conditionally compile in the Uniform CD-ROM driver -if [ "$CONFIG_BLK_DEV_SR" = "y" ]; then - define_bool CONFIG_CDROM y -else - if [ "$CONFIG_BLK_DEV_SR" = "m" ]; then - define_bool CONFIG_CDROM m - else - define_bool CONFIG_CDROM n - fi -fi - source fs/Config.in source fs/nls/Config.in |