From f1be8036edfdefdb389f9171d6c610e542642d21 Mon Sep 17 00:00:00 2001
From: Bart De Schuymer <bdschuym@pandora.be>
Date: Thu, 29 Aug 2002 20:10:24 +0000
Subject: 2.5.32

---
 br-nf-bds/linux2.5/net/Config.in | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'br-nf-bds/linux2.5/net')

diff --git a/br-nf-bds/linux2.5/net/Config.in b/br-nf-bds/linux2.5/net/Config.in
index 4c408f2..12faa89 100644
--- a/br-nf-bds/linux2.5/net/Config.in
+++ b/br-nf-bds/linux2.5/net/Config.in
@@ -44,13 +44,17 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
 fi
 tristate '802.1Q VLAN Support' CONFIG_VLAN_8021Q
 
-comment ' '
-tristate 'The IPX protocol' CONFIG_IPX
+tristate 'ANSI/IEEE 802.2 Data link layer protocol' CONFIG_LLC
+if [ "$CONFIG_LLC" != "n" ]; then
+   tristate '  LLC sockets interface' CONFIG_LLC_UI
+fi
+
+dep_tristate 'The IPX protocol' CONFIG_IPX $CONFIG_LLC
 if [ "$CONFIG_IPX" != "n" ]; then
    source net/ipx/Config.in
 fi
 
-tristate 'Appletalk protocol support' CONFIG_ATALK
+dep_tristate 'Appletalk protocol support' CONFIG_ATALK $CONFIG_LLC
 source drivers/net/appletalk/Config.in
 
 tristate 'DECnet Support' CONFIG_DECNET
@@ -67,11 +71,6 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
    fi
    tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25
    tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB
-   tristate 'ANSI/IEEE 802.2 Data link layer protocol' CONFIG_LLC
-   if [ "$CONFIG_LLC" != "n" ]; then
-	# When NETBEUI is added the following line will be a tristate
-	define_bool CONFIG_LLC_UI y
-   fi
    bool 'Frame Diverter (EXPERIMENTAL)' CONFIG_NET_DIVERT
    if [ "$CONFIG_INET" = "y" ]; then
       tristate 'Acorn Econet/AUN protocols (EXPERIMENTAL)' CONFIG_ECONET
-- 
cgit v1.2.3