diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:22 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:22 -0500 |
commit | 3fc3cbf786b6e73cd5cfe2f3233410a260405c86 (patch) | |
tree | 6ffd4486769df6791b5a99284d0d05adc817f4a4 /drivers | |
parent | 2bc4cf2d826cb497063f6a84ab444cff13537e5f (diff) |
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.c | 3 | ||||
-rw-r--r-- | drivers/ide/ide-cd.h | 7 |
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) | |||
2855 | 2855 | ||
2856 | cd->cd_flags |= IDE_CD_FLAG_MEDIA_CHANGED; | 2856 | cd->cd_flags |= IDE_CD_FLAG_MEDIA_CHANGED; |
2857 | 2857 | ||
2858 | #if NO_DOOR_LOCKING | ||
2859 | cd->cd_flags |= IDE_CD_FLAG_NO_DOORLOCK; | ||
2860 | #endif | ||
2861 | if ((drive->id->config & 0x0060) == 0x20) | 2858 | if ((drive->id->config & 0x0060) == 0x20) |
2862 | cd->cd_flags |= IDE_CD_FLAG_DRQ_INTERRUPT; | 2859 | cd->cd_flags |= IDE_CD_FLAG_DRQ_INTERRUPT; |
2863 | cd->cd_flags |= IDE_CD_FLAG_NO_EJECT; | 2860 | 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 @@ | |||
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | 30 | ||
31 | /* Turning this on will disable the door-locking functionality. | ||
32 | This is apparently needed for supermount. */ | ||
33 | |||
34 | #ifndef NO_DOOR_LOCKING | ||
35 | #define NO_DOOR_LOCKING 0 | ||
36 | #endif | ||
37 | |||
38 | /* | 31 | /* |
39 | * typical timeout for packet command | 32 | * typical timeout for packet command |
40 | */ | 33 | */ |