diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-11-27 23:23:52 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-11-27 23:23:52 -0500 |
| commit | b5a20aa2657063cbf3b47fc700603180de4bb554 (patch) | |
| tree | 9419fb851cda53a7f1fd67a3697bdf8550df19e4 /drivers/block/floppy.c | |
| parent | cc09c0dc57de7f7d2ed89d480b5653e5f6a32f2c (diff) | |
| parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/block/floppy.c')
| -rw-r--r-- | drivers/block/floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 14db747a636e..cf29cc4e6ab7 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
| @@ -4124,7 +4124,7 @@ static int __init floppy_setup(char *str) | |||
| 4124 | printk("\n"); | 4124 | printk("\n"); |
| 4125 | } else | 4125 | } else |
| 4126 | DPRINT("botched floppy option\n"); | 4126 | DPRINT("botched floppy option\n"); |
| 4127 | DPRINT("Read Documentation/floppy.txt\n"); | 4127 | DPRINT("Read Documentation/blockdev/floppy.txt\n"); |
| 4128 | return 0; | 4128 | return 0; |
| 4129 | } | 4129 | } |
| 4130 | 4130 | ||