diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /drivers/block/genhd.c | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'drivers/block/genhd.c')
| -rw-r--r-- | drivers/block/genhd.c | 10 |
1 files changed, 3 insertions, 7 deletions
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 @@ -37,16 +37,12 @@ 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 |