Merge master.kernel.org:/home/acme/BK/llc-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

Merge master.kernel.org:/home/acme/BK/llc-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
5372e646 · David S. Miller · bcb632aa · 53e0db84 · 5372e646
Commit 5372e646 authored Sep 29, 2002 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

net/Config.in net/Config.in +2 -2

No files found.
--- a/net/Config.in
+++ b/net/Config.in
@@ -47,9 +47,9 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
 fi
 tristate '802.1Q VLAN Support' CONFIG_VLAN_8021Q

-tristate 'ANSI/IEEE 802.2 Data link layer protocol' CONFIG_LLC
+tristate 'ANSI/IEEE 802.2 Data link layer protocol (IPX, Appletalk)' CONFIG_LLC
 if [ "$CONFIG_LLC" != "n" ]; then
-   tristate '  LLC sockets interface' CONFIG_LLC_UI
+   bool '  LLC sockets interface' CONFIG_LLC_UI
 fi

 dep_tristate 'The IPX protocol' CONFIG_IPX $CONFIG_LLC