summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 23:09:22 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 23:09:22 +0100
commit3fc3cbf786b6e73cd5cfe2f3233410a260405c86 (patch)
tree6ffd4486769df6791b5a99284d0d05adc817f4a4 /drivers
parent2bc4cf2d826cb497063f6a84ab444cff13537e5f (diff)
downloadlinux-3fc3cbf786b6e73cd5cfe2f3233410a260405c86.tar.bz2
ide-cd: remove NO_DOOR_LOCKING define
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/ide-cd.c3
-rw-r--r--drivers/ide/ide-cd.h7
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index a049750ced16..1232086d2e1a 100644
--- 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 c19aa23255d1..59b43935630f 100644
--- 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
*/