Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[linux-2.6] / drivers / net / appletalk / Kconfig

diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
index 69c488d933a2bb799d8e5c9853cb262358a75e9f..0a0e0cd81a23a1fd5a16581fca361d7742bfaed4 100644 (file)
--- a/drivers/net/appletalk/Kconfig
+++ b/drivers/net/appletalk/Kconfig
@@ -1,8 +1,35 @@
 #
 # Appletalk driver configuration
 #
 #
 # Appletalk driver configuration
 #

+config ATALK
+       tristate "Appletalk protocol support"
+       select LLC
+       ---help---
+         AppleTalk is the protocol that Apple computers can use to communicate
+         on a network.  If your Linux box is connected to such a network and you
+         wish to connect to it, say Y.  You will need to use the netatalk package
+         so that your Linux box can act as a print and file server for Macs as
+         well as access AppleTalk printers.  Check out
+         <http://www.zettabyte.net/netatalk/> on the WWW for details.
+         EtherTalk is the name used for AppleTalk over Ethernet and the
+         cheaper and slower LocalTalk is AppleTalk over a proprietary Apple
+         network using serial links.  EtherTalk and LocalTalk are fully
+         supported by Linux.
+
+         General information about how to connect Linux, Windows machines and
+         Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.  The
+         NET-3-HOWTO, available from
+         <http://www.tldp.org/docs.html#howto>, contains valuable
+         information as well.
+
+         To compile this driver as a module, choose M here: the module will be
+         called appletalk. You almost certainly want to compile it as a
+         module so you can restart your AppleTalk stack without rebooting
+         your machine. I hear that the GNU boycott of Apple is over, so
+         even politically correct people are allowed to say Y here.
+

 config DEV_APPLETALK
 config DEV_APPLETALK

-       bool "Appletalk interfaces support"
+       tristate "Appletalk interfaces support"

        depends on ATALK
        help
          AppleTalk is the protocol that Apple computers can use to communicate
        depends on ATALK
        help
          AppleTalk is the protocol that Apple computers can use to communicate