Skip to content

L
linux
Commit 5372e646 authored by David S. Miller's avatar David S. Miller
Browse files
Options

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

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents bcb632aa 53e0db84
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
net/Config.in
View file @ 5372e646
...@@ -47,9 +47,9 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then ...@@ -47,9 +47,9 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
fi fi
tristate '802.1Q VLAN Support' CONFIG_VLAN_8021Q 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 if [ "$CONFIG_LLC" != "n" ]; then
tristate ' LLC sockets interface' CONFIG_LLC_UI bool ' LLC sockets interface' CONFIG_LLC_UI
fi fi
dep_tristate 'The IPX protocol' CONFIG_IPX $CONFIG_LLC dep_tristate 'The IPX protocol' CONFIG_IPX $CONFIG_LLC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7