Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

[pandora-kernel.git] / net / ipx / Kconfig

diff --git a/net/ipx/Kconfig b/net/ipx/Kconfig
index 980a826..02549cb 100644 (file)
--- a/net/ipx/Kconfig
+++ b/net/ipx/Kconfig
@@ -3,6 +3,7 @@
 #
 config IPX
        tristate "The IPX protocol"
+       depends on BKL # should be fixable
        select LLC
        ---help---
          This is support for the Novell networking protocol, IPX, commonly
@@ -16,8 +17,7 @@ config IPX
          support", below.
 
          IPX is similar in scope to IP, while SPX, which runs on top of IPX,
-         is similar to TCP. There is also experimental support for SPX in
-         Linux (see "SPX networking", below).
+         is similar to TCP.
 
          To turn your Linux box into a fully featured NetWare file server and
          IPX router, say Y here and fetch either lwared from
@@ -26,9 +26,6 @@ config IPX
          information, read the IPX-HOWTO available from
          <http://www.tldp.org/docs.html#howto>.
 
-         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 IPX driver would enlarge your kernel by about 16 KB. To compile
          this driver as a module, choose M here: the module will be called ipx.
          Unless you want to integrate your Linux box with a local Novell