Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3fc3cb...
Commit: 3fc3cbf786b6e73cd5cfe2f3233410a260405c86
Parent: 2bc4cf2d826cb497063f6a84ab444cff13537e5f
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
AuthorDate: Fri Feb 1 23:09:22 2008 +0100
Committer: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
CommitDate: Fri Feb 1 23:09:22 2008 +0100
ide-cd: remove NO_DOOR_LOCKING define
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/ide-cd.c | 3 ---
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 a049750..1232086 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 c19aa23..59b4393 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
*/
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
