aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide/ide-disk.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-19 16:31:03 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-19 16:31:03 -0800
commit44779149e91ec8e684be23e06dc05197e367a45f (patch)
treeef1f38740133466f08d12c0a497333d47ab8f7a4 /drivers/ide/ide-disk.c
parent8ee3f402676bf59caa454b7171ae09c8ac136627 (diff)
parent17514e8a6f1836a5c95b1f18d2bc0493ad732cf0 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'drivers/ide/ide-disk.c')
-rw-r--r--drivers/ide/ide-disk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 1a45f75dc9b..f4e3d3527b0 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1266,7 +1266,7 @@ static void __exit idedisk_exit (void)
driver_unregister(&idedisk_driver.gen_driver);
}
-static int idedisk_init (void)
+static int __init idedisk_init(void)
{
return driver_register(&idedisk_driver.gen_driver);
}