diff --git a/[refs] b/[refs]
index 077e532a68b1..7a8b1c0bb00c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffa793f9bb5b563edb4cacc43a4d6677eec0e36b
+refs/heads/master: 01c22bfc30a3f40fed08cfd2779348edcb6c5e53
diff --git a/trunk/drivers/ide/Makefile b/trunk/drivers/ide/Makefile
index 8605536ea18f..39e99ace5cd3 100644
--- a/trunk/drivers/ide/Makefile
+++ b/trunk/drivers/ide/Makefile
@@ -62,7 +62,6 @@ endif
 
 obj-$(CONFIG_BLK_DEV_IDE)		+= arm/ mips/
 
-# old hd driver must be last
 ifeq ($(CONFIG_BLK_DEV_HD), y)
 	hd-core-y += legacy/hd.o
 	obj-y += hd-core.o
diff --git a/trunk/drivers/ide/legacy/hd.c b/trunk/drivers/ide/legacy/hd.c
index abdedf56643e..00b695652b2a 100644
--- a/trunk/drivers/ide/legacy/hd.c
+++ b/trunk/drivers/ide/legacy/hd.c
@@ -812,4 +812,4 @@ static int __init parse_hd_setup(char *line)
 }
 __setup("hd=", parse_hd_setup);
 
-module_init(hd_init);
+late_initcall(hd_init);