Merge branch 'core/rcu' into core/rcu-for-linus

[linux-2.6] / drivers / ide / ide-cd.c

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 043129c422fe054a7cb1fcdaa4d44ae54576cfd8..d99847157186e9669efd3f56bfdb5eac54de7042 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -2106,11 +2106,6 @@ static int ide_cd_probe(ide_drive_t *drive)
                        goto failed;
                }
        }
-       if (drive->scsi) {
-               printk(KERN_INFO "ide-cd: passing drive %s to ide-scsi "
-                                "emulation.\n", drive->name);
-               goto failed;
-       }
        info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL);
        if (info == NULL) {
                printk(KERN_ERR "%s: Can't allocate a cdrom structure\n",