[2/5] ide/legacy/hd.c: use late_initcall()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Adrian Bunk
Date: Tuesday, June 24, 2008 - 2:54 pm

Since the later move to drivers/block/ will break the link order,
the module_init() has to become a late_initcall().

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

 drivers/ide/Makefile    |    1 -
 drivers/ide/legacy/hd.c |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

14c4f831bae87b5b268fdf53269b6a6a65b2efe9 diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index f94b679..4c95e0f 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -59,7 +59,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/drivers/ide/legacy/hd.c b/drivers/ide/legacy/hd.c
index abdedf5..00b6956 100644
--- a/drivers/ide/legacy/hd.c
+++ b/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);

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[2.6 patch] fix BLK_DEV_HD_ONLY on ARM dependencies, Adrian Bunk, (Mon Jun 9, 3:21 pm)
Re: [2.6 patch] fix BLK_DEV_HD_ONLY on ARM dependencies, Bartlomiej Zolnierki ..., (Tue Jun 10, 10:56 am)
Re: [2.6 patch] fix BLK_DEV_HD_ONLY on ARM dependencies, Bartlomiej Zolnierki ..., (Sun Jun 22, 6:21 am)
[0/5] move hd.c to drivers/block/, Adrian Bunk, (Tue Jun 24, 2:54 pm)
[1/5] remove BLK_DEV_HD_ONLY, Adrian Bunk, (Tue Jun 24, 2:54 pm)
[2/5] ide/legacy/hd.c: use late_initcall(), Adrian Bunk, (Tue Jun 24, 2:54 pm)
[3/5] move ide/legacy/hd.c to drivers/block/, Adrian Bunk, (Tue Jun 24, 2:54 pm)
[4/5] update the BLK_DEV_HD help text, Adrian Bunk, (Tue Jun 24, 2:55 pm)
Re: [0/5] move hd.c to drivers/block/, Bartlomiej Zolnierki ..., (Wed Jun 25, 1:16 pm)