mirror of
https://github.com/torvalds/linux.git
synced 2024-09-21 15:33:19 +00:00
ide-cd: remove NO_DOOR_LOCKING define
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
2bc4cf2d82
commit
3fc3cbf786
|
@ -2855,9 +2855,6 @@ int ide_cdrom_setup (ide_drive_t *drive)
|
||||||
|
|
||||||
cd->cd_flags |= IDE_CD_FLAG_MEDIA_CHANGED;
|
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)
|
if ((drive->id->config & 0x0060) == 0x20)
|
||||||
cd->cd_flags |= IDE_CD_FLAG_DRQ_INTERRUPT;
|
cd->cd_flags |= IDE_CD_FLAG_DRQ_INTERRUPT;
|
||||||
cd->cd_flags |= IDE_CD_FLAG_NO_EJECT;
|
cd->cd_flags |= IDE_CD_FLAG_NO_EJECT;
|
||||||
|
|
|
@ -28,13 +28,6 @@
|
||||||
#endif
|
#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
|
* typical timeout for packet command
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue
Block a user