summaryrefslogtreecommitdiffstats
path: root/arch/sparc/config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-07 15:45:24 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-07 15:45:24 +0000
commit9f9f3e6e8548a596697778337110a423c384b6f3 (patch)
tree5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /arch/sparc/config.in
parentd5c9a365ee7d2fded249aa5abfc5e89587583029 (diff)
Merge with Linux 2.3.49.
Diffstat (limited to 'arch/sparc/config.in')
-rw-r--r--arch/sparc/config.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/config.in b/arch/sparc/config.in
index ebaa64806..756e531c2 100644
--- a/arch/sparc/config.in
+++ b/arch/sparc/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.86 2000/02/10 02:51:10 davem Exp $
+# $Id: config.in,v 1.87 2000/02/27 19:34:12 davem Exp $
# For a description of the syntax of this configuration file,
# see the Configure script.
#
@@ -163,6 +163,7 @@ if [ "$CONFIG_NET" = "y" ]; then
bool 'Network device support' CONFIG_NETDEVICES
if [ "$CONFIG_NETDEVICES" = "y" ]; then
tristate ' Dummy net driver support' CONFIG_DUMMY
+ tristate ' Bonding driver support' CONFIG_BONDING
tristate ' PPP (point-to-point) support' CONFIG_PPP
if [ ! "$CONFIG_PPP" = "n" ]; then
dep_tristate ' PPP support for async serial ports' CONFIG_PPP_ASYNC $CONFIG_PPP