ide-cd: remove NO_DOOR_LOCKING define

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index a049750ced1692c1254b3656ee8ce3af35052eab..1232086d2e1a6bc51adc9f1360d66e9a0b5ab6e9 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -2855,9 +2855,6 @@ int ide_cdrom_setup (ide_drive_t *drive)
 
        cd->cd_flags |= IDE_CD_FLAG_MEDIA_CHANGED;
 
-#if NO_DOOR_LOCKING
-       cd->cd_flags |= IDE_CD_FLAG_NO_DOORLOCK;
-#endif
        if ((drive->id->config & 0x0060) == 0x20)
                cd->cd_flags |= IDE_CD_FLAG_DRQ_INTERRUPT;
        cd->cd_flags |= IDE_CD_FLAG_NO_EJECT;

diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h
index c19aa23255d1766d542ec89bb5456aaefc6df37f..59b43935630fc4dbc36d46a5cb48aa9ca2ccb743 100644 (file)
--- a/drivers/ide/ide-cd.h
+++ b/drivers/ide/ide-cd.h
@@ -28,13 +28,6 @@
 #endif
 
 
-/* Turning this on will disable the door-locking functionality.
-   This is apparently needed for supermount. */
-
-#ifndef NO_DOOR_LOCKING
-#define NO_DOOR_LOCKING 0
-#endif
-
 /*
  * typical timeout for packet command
  */