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-cd.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-cd.c')
| -rw-r--r-- | drivers/ide/ide-cd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 421b62d900af..9455e42abb23 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -3510,8 +3510,8 @@ static void __exit ide_cdrom_exit(void) | |||
| 3510 | { | 3510 | { |
| 3511 | driver_unregister(&ide_cdrom_driver.gen_driver); | 3511 | driver_unregister(&ide_cdrom_driver.gen_driver); |
| 3512 | } | 3512 | } |
| 3513 | 3513 | ||
| 3514 | static int ide_cdrom_init(void) | 3514 | static int __init ide_cdrom_init(void) |
| 3515 | { | 3515 | { |
| 3516 | return driver_register(&ide_cdrom_driver.gen_driver); | 3516 | return driver_register(&ide_cdrom_driver.gen_driver); |
| 3517 | } | 3517 | } |