Merge branches 'release' and 'doc' into release

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

diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
index b14e89004c3aa607031b5aba3c97dab96e9b0e68..0a0e0cd81a23a1fd5a16581fca361d7742bfaed4 100644 (file)
--- a/drivers/net/appletalk/Kconfig
+++ b/drivers/net/appletalk/Kconfig
@@ -29,7 +29,7 @@ config ATALK
          even politically correct people are allowed to say Y here.
 
 config DEV_APPLETALK
          even politically correct people are allowed to say Y here.
 
 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