瀏覽代碼

ide-cd: remove NO_DOOR_LOCKING define

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Bartlomiej Zolnierkiewicz 17 年之前
父節點
當前提交
3fc3cbf786
共有 2 個文件被更改,包括 0 次插入10 次删除
  1. 0 3
      drivers/ide/ide-cd.c
  2. 0 7
      drivers/ide/ide-cd.h

+ 0 - 3
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;
 	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;

+ 0 - 7
drivers/ide/ide-cd.h

@@ -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
  */
  */