diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-18 18:16:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-18 18:16:12 -0400 |
| commit | 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 (patch) | |
| tree | afa2160e4b611f2991c09a6d6dc6079e47105605 /drivers/ide/ide-floppy.c | |
| parent | 5fdf193b15a08f6c32ca4eb5913fa9be788e790e (diff) | |
| parent | 84f57fbc724e3b56dc87c37dddac89f82cf75ef6 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 9eab6426148e..29c22fc278c6 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -317,7 +317,7 @@ typedef struct ide_floppy_obj { | |||
| 317 | unsigned long flags; | 317 | unsigned long flags; |
| 318 | } idefloppy_floppy_t; | 318 | } idefloppy_floppy_t; |
| 319 | 319 | ||
| 320 | #define IDEFLOPPY_TICKS_DELAY 3 /* default delay for ZIP 100 */ | 320 | #define IDEFLOPPY_TICKS_DELAY HZ/20 /* default delay for ZIP 100 (50ms) */ |
| 321 | 321 | ||
| 322 | /* | 322 | /* |
| 323 | * Floppy flag bits values. | 323 | * Floppy flag bits values. |