Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged

[linux-beck.git] / Documentation / blockdev / floppy.txt

diff --git a/Documentation/blockdev/floppy.txt b/Documentation/blockdev/floppy.txt
index 6ccab88705cbae4d327c143b7608363ebc2459e0..470fe4b5e37989d5b1b623b25519bd44152fb62d 100644 (file)
--- a/Documentation/blockdev/floppy.txt
+++ b/Documentation/blockdev/floppy.txt
@@ -49,7 +49,7 @@ you can put:
 
  options floppy omnibook messages
 
-in /etc/modprobe.conf.
+in a configuration file in /etc/modprobe.d/.
 
 
  The floppy driver related options are: