diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
| commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
| tree | 8224d013ff5d255420713d05610c7efebd204d2a /drivers/block/ll_rw_blk.c | |
| parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) | |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'drivers/block/ll_rw_blk.c')
| -rw-r--r-- | drivers/block/ll_rw_blk.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c index 07098974d..925423581 100644 --- a/drivers/block/ll_rw_blk.c +++ b/drivers/block/ll_rw_blk.c @@ -654,7 +654,6 @@ void ll_rw_swap_file(int rw, kdev_t dev, unsigned int *b, int nb, char *buf) } } } - #ifdef CONFIG_BLK_DEV_EZ extern void ez_init( void ); #endif @@ -694,9 +693,12 @@ __initfunc(int blk_dev_init(void)) #ifdef CONFIG_BLK_DEV_LOOP loop_init(); #endif -#ifdef CONFIG_CDI_INIT - cdi_init(); /* this MUST precede ide_init */ -#endif CONFIG_CDI_INIT +#ifdef CONFIG_CDROM /* this must precede all CD-ROM drivers */ + cdrom_init(); +#endif CONFIG_CDROM +#ifdef CONFIG_ISP16_CDI + isp16_init(); +#endif CONFIG_ISP16_CDI #ifdef CONFIG_BLK_DEV_IDE ide_init(); /* this MUST precede hd_init */ #endif |