Commit 94f93c1b authored by Tom Rini's avatar Tom Rini Committed by David S. Miller

CONFIG_APPLETALK and

CONFIG_DEV_APPLETALK are meant for the same thing.  Rename
all uses to CONFIG_DEV_APPLETALK, use consistently inside
drivers/net/appletalk/Config.in and update documentation
to match.
parent faf86c5d
...@@ -141,7 +141,7 @@ DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o ...@@ -141,7 +141,7 @@ DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
DRIVERS-$(CONFIG_APPLETALK) += drivers/net/appletalk/appletalk.o DRIVERS-$(CONFIG_DEV_APPLETALK) += drivers/net/appletalk/appletalk.o
DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
DRIVERS-$(CONFIG_WAN) += drivers/net/wan/wan.o DRIVERS-$(CONFIG_WAN) += drivers/net/wan/wan.o
DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
# #
source drivers/net/arcnet/Config.in source drivers/net/arcnet/Config.in
source drivers/net/appletalk/Config.in
tristate 'Dummy net driver support' CONFIG_DUMMY tristate 'Dummy net driver support' CONFIG_DUMMY
tristate 'Bonding driver support' CONFIG_BONDING tristate 'Bonding driver support' CONFIG_BONDING
......
...@@ -42,7 +42,7 @@ subdir-$(CONFIG_TR) += tokenring ...@@ -42,7 +42,7 @@ subdir-$(CONFIG_TR) += tokenring
subdir-$(CONFIG_WAN) += wan subdir-$(CONFIG_WAN) += wan
subdir-$(CONFIG_NET_FC) += fc subdir-$(CONFIG_NET_FC) += fc
subdir-$(CONFIG_ARCNET) += arcnet subdir-$(CONFIG_ARCNET) += arcnet
subdir-$(CONFIG_APPLETALK) += appletalk subdir-$(CONFIG_DEV_APPLETALK) += appletalk
subdir-$(CONFIG_SK98LIN) += sk98lin subdir-$(CONFIG_SK98LIN) += sk98lin
subdir-$(CONFIG_SKFP) += skfp subdir-$(CONFIG_SKFP) += skfp
......
CONFIG_APPLETALK CONFIG_DEV_APPLETALK
AppleTalk is the way Apple computers speak to each other on a AppleTalk is the protocol that Apple computers can use to communicate
network. If your Linux box is connected to such a network and you on a network. If your Linux box is connected to such a network, and wish
want to join the conversation, say Y. to do IP over it, or you have a LocalTalk card and wish to use it to
connect to the AppleTalk network, say Y.
CONFIG_IPDDP CONFIG_IPDDP
This allows IP networking for users who only have AppleTalk This allows IP networking for users who only have AppleTalk
......
...@@ -2,22 +2,20 @@ ...@@ -2,22 +2,20 @@
# Appletalk driver configuration # Appletalk driver configuration
# #
if [ "$CONFIG_ATALK" != "n" ]; then mainmenu_option next_comment
mainmenu_option next_comment comment 'Appletalk devices'
comment 'Appletalk devices' dep_mbool 'Appletalk interfaces support' CONFIG_DEV_APPLETALK $CONFIG_ATALK
bool 'Appletalk interfaces support' CONFIG_APPLETALK if [ "$CONFIG_DEV_APPLETALK" = "y" ]; then
if [ "$CONFIG_ATALK" != "n" ]; then tristate ' Apple/Farallon LocalTalk PC support' CONFIG_LTPC
dep_tristate ' Apple/Farallon LocalTalk PC support' CONFIG_LTPC $CONFIG_DEV_APPLETALK tristate ' COPS LocalTalk PC support' CONFIG_COPS
dep_tristate ' COPS LocalTalk PC support' CONFIG_COPS $CONFIG_DEV_APPLETALK
if [ "$CONFIG_COPS" != "n" ]; then if [ "$CONFIG_COPS" != "n" ]; then
bool ' Dayna firmware support' CONFIG_COPS_DAYNA bool ' Dayna firmware support' CONFIG_COPS_DAYNA $CONFIG_COPS
bool ' Tangent firmware support' CONFIG_COPS_TANGENT bool ' Tangent firmware support' CONFIG_COPS_TANGENT $CONFIG_COPS
fi fi
dep_tristate ' Appletalk-IP driver support' CONFIG_IPDDP $CONFIG_DEV_APPLETALK dep_tristate ' Appletalk-IP driver support' CONFIG_IPDDP $CONFIG_ATALK
if [ "$CONFIG_IPDDP" != "n" ]; then if [ "$CONFIG_IPDDP" != "n" ]; then
bool ' IP to Appletalk-IP Encapsulation support' CONFIG_IPDDP_ENCAP bool ' IP to Appletalk-IP Encapsulation support' CONFIG_IPDDP_ENCAP $CONFIG_IPDDP
bool ' Appletalk-IP to IP Decapsulation support' CONFIG_IPDDP_DECAP bool ' Appletalk-IP to IP Decapsulation support' CONFIG_IPDDP_DECAP $CONFIG_IPDDP
fi fi
fi
endmenu
fi fi
endmenu
...@@ -190,11 +190,11 @@ CONFIG_DECNET ...@@ -190,11 +190,11 @@ CONFIG_DECNET
The module is called decnet.o. The module is called decnet.o.
CONFIG_ATALK CONFIG_ATALK
AppleTalk is the way Apple computers speak to each other on a AppleTalk is the protocol that Apple computers can use to communicate
network. If your Linux box is connected to such a network and you on a network. If your Linux box is connected to such a network and you
want to join the conversation, say Y. You will need to use the wish to connect to it, say Y. You will need to use the netatalk package
netatalk package so that your Linux box can act as a print and file so that your Linux box can act as a print and file server for Macs as
server for Macs as well as access AppleTalk printers. Check out well as access AppleTalk printers. Check out
<http://www.zettabyte.net/netatalk/> on the WWW for details. <http://www.zettabyte.net/netatalk/> on the WWW for details.
EtherTalk is the name used for AppleTalk over Ethernet and the EtherTalk is the name used for AppleTalk over Ethernet and the
cheaper and slower LocalTalk is AppleTalk over a proprietary Apple cheaper and slower LocalTalk is AppleTalk over a proprietary Apple
......
...@@ -52,7 +52,10 @@ tristate 'The IPX protocol' CONFIG_IPX ...@@ -52,7 +52,10 @@ tristate 'The IPX protocol' CONFIG_IPX
if [ "$CONFIG_IPX" != "n" ]; then if [ "$CONFIG_IPX" != "n" ]; then
source net/ipx/Config.in source net/ipx/Config.in
fi fi
tristate 'Appletalk protocol support' CONFIG_ATALK tristate 'Appletalk protocol support' CONFIG_ATALK
source drivers/net/appletalk/Config.in
tristate 'DECnet Support' CONFIG_DECNET tristate 'DECnet Support' CONFIG_DECNET
if [ "$CONFIG_DECNET" != "n" ]; then if [ "$CONFIG_DECNET" != "n" ]; then
source net/decnet/Config.in source net/decnet/Config.in
......
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