aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide/ide-disk.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-20 01:05:46 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-20 01:05:46 -0500
commit30765528d156e58d41ed07cae8726c9105111b9d (patch)
tree95021732c4c13eaabc88eb037fed89d38f45d496 /drivers/ide/ide-disk.c
parente1d7a2de6c4249072dd886c129410e11e637ceff (diff)
parent3bedff1d73b86e0cf52634efb447e9ada08f2cc6 (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/ide/ide-disk.c')
-rw-r--r--drivers/ide/ide-disk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index e827b39e4b3..f4e3d3527b0 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1089,8 +1089,8 @@ static void ide_device_shutdown(struct device *dev)
}
static ide_driver_t idedisk_driver = {
- .owner = THIS_MODULE,
.gen_driver = {
+ .owner = THIS_MODULE,
.name = "ide-disk",
.bus = &ide_bus_type,
.probe = ide_disk_probe,
@@ -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);
}