From 0317c4045daefadf453bbe4271a61bf9fd093611 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 1 Feb 2008 23:09:22 +0100 Subject: [PATCH] --- yaml --- r: 82092 b: refs/heads/master c: 3fc3cbf786b6e73cd5cfe2f3233410a260405c86 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-cd.c | 3 --- trunk/drivers/ide/ide-cd.h | 7 ------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index f86536a0d51e..1813d2998141 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bc4cf2d826cb497063f6a84ab444cff13537e5f +refs/heads/master: 3fc3cbf786b6e73cd5cfe2f3233410a260405c86 diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c index a049750ced16..1232086d2e1a 100644 --- a/trunk/drivers/ide/ide-cd.c +++ b/trunk/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/trunk/drivers/ide/ide-cd.h b/trunk/drivers/ide/ide-cd.h index c19aa23255d1..59b43935630f 100644 --- a/trunk/drivers/ide/ide-cd.h +++ b/trunk/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 */