Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes

[~andy/linux] / drivers / net / wan / Kconfig

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 423eb26386c87c7594b460cf18f2589254184e0d..d70ede7a7f96bd98f1e5175761d3c598086fe72d 100644 (file)
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -290,8 +290,8 @@ config FARSYNC
          Frame Relay or X.25/LAPB.
 
          If you want the module to be automatically loaded when the interface
-         is referenced then you should add "alias hdlcX farsync" to
-         /etc/modprobe.conf for each interface, where X is 0, 1, 2, ..., or
+         is referenced then you should add "alias hdlcX farsync" to a file
+         in /etc/modprobe.d/ for each interface, where X is 0, 1, 2, ..., or
          simply use "alias hdlc* farsync" to indicate all of them.
 
          To compile this driver as a module, choose M here: the