From b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 28 Apr 2000 01:09:25 +0000
Subject: Merge with 2.3.99-pre6.

---
 drivers/block/genhd.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'drivers/block/genhd.c')

diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index 3f3237e87..a9bf58157 100644
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -36,17 +36,13 @@ void __init device_init(void)
 {
 #ifdef CONFIG_PARPORT
 	parport_init();
-#endif
-	/*
-	 *	I2O must come before block and char as the I2O layer may
-	 *	in future claim devices that block/char most not touch.
-	 */
-#ifdef CONFIG_I2O
-	i2o_init();
 #endif
 	chr_dev_init();
 	blk_dev_init();
 	sti();
+#ifdef CONFIG_I2O
+	i2o_init();
+#endif
 #ifdef CONFIG_BLK_DEV_DAC960
 	DAC960_Initialize();
 #endif
-- 
cgit v1.2.3