diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-19 19:31:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-19 19:31:03 -0500 |
| commit | 44779149e91ec8e684be23e06dc05197e367a45f (patch) | |
| tree | ef1f38740133466f08d12c0a497333d47ab8f7a4 /drivers/ide/ide-floppy.c | |
| parent | 8ee3f402676bf59caa454b7171ae09c8ac136627 (diff) | |
| parent | 17514e8a6f1836a5c95b1f18d2bc0493ad732cf0 (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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 94c147b79a49..9e293c8063dc 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -2191,10 +2191,7 @@ static void __exit idefloppy_exit (void) | |||
| 2191 | driver_unregister(&idefloppy_driver.gen_driver); | 2191 | driver_unregister(&idefloppy_driver.gen_driver); |
| 2192 | } | 2192 | } |
| 2193 | 2193 | ||
| 2194 | /* | 2194 | static int __init idefloppy_init(void) |
| 2195 | * idefloppy_init will register the driver for each floppy. | ||
| 2196 | */ | ||
| 2197 | static int idefloppy_init (void) | ||
| 2198 | { | 2195 | { |
| 2199 | printk("ide-floppy driver " IDEFLOPPY_VERSION "\n"); | 2196 | printk("ide-floppy driver " IDEFLOPPY_VERSION "\n"); |
| 2200 | return driver_register(&idefloppy_driver.gen_driver); | 2197 | return driver_register(&idefloppy_driver.gen_driver); |