aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavem <davem>2001-11-30 00:17:32 +0000
committerdavem <davem>2001-11-30 00:17:32 +0000
commit9f1114b94cfc5c116e1daab0abb8fcc26fc94a5f (patch)
treed58b79744a49423dc806021ac4d8115370328481
parent7b8823cab0a3fc8b43ccd9280c7e2c66e6e2f51b (diff)
downloadnetdev-vger-cvs-9f1114b94cfc5c116e1daab0abb8fcc26fc94a5f.tar.gz
Add CONFIG_HOTPLUG option, remove spurious
CONFIG_FB option as drivers/video has it.
-rw-r--r--arch/sparc64/config.in5
-rw-r--r--arch/sparc64/defconfig2
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/sparc64/config.in b/arch/sparc64/config.in
index b1e96ed54..20e048e10 100644
--- a/arch/sparc64/config.in
+++ b/arch/sparc64/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.155 2001-11-17 00:15:27 davem Exp $
+# $Id: config.in,v 1.156 2001-11-30 00:17:32 davem Exp $
# For a description of the syntax of this configuration file,
# see the Configure script.
#
@@ -31,6 +31,8 @@ bool 'Symmetric multi-processing support' CONFIG_SMP
# Identify this as a Sparc64 build
define_bool CONFIG_SPARC64 y
+bool 'Support for hot-pluggable devices' CONFIG_HOTPLUG
+
# Global things across all Sun machines.
define_bool CONFIG_HAVE_DEC_LOCK y
define_bool CONFIG_RWSEM_GENERIC_SPINLOCK n
@@ -89,7 +91,6 @@ endmenu
mainmenu_option next_comment
comment 'Console drivers'
bool 'PROM console' CONFIG_PROM_CONSOLE
-bool 'Support Frame buffer devices' CONFIG_FB
source drivers/video/Config.in
endmenu
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index f931b9ce0..193e914a9 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -22,6 +22,7 @@ CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_SMP=y
CONFIG_SPARC64=y
+CONFIG_HOTPLUG=y
CONFIG_HAVE_DEC_LOCK=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -84,7 +85,6 @@ CONFIG_WATCHDOG_RIO=m
# Console drivers
#
CONFIG_PROM_CONSOLE=y
-CONFIG_FB=y
#
# Frame-buffer support