From c32c829dd072a49392d9732d23f6810e309ea4b4 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <petkovbb@googlemail.com>
Date: Wed, 23 Jul 2008 19:56:01 +0200
Subject: [PATCH] --- yaml --- r: 105042 b: refs/heads/master c:
 ac77ef8b03677c8ae8afe77bccc5f6a969193a79 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/ide/ide-atapi.c | 3 +--
 trunk/include/linux/ide.h     | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 01fe475e0b8a..bd1033775e05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be4c916e96bcde629463d7577d4c402c7f6e6f3e
+refs/heads/master: ac77ef8b03677c8ae8afe77bccc5f6a969193a79
diff --git a/trunk/drivers/ide/ide-atapi.c b/trunk/drivers/ide/ide-atapi.c
index 711a5f6d35e4..adf04f99cdeb 100644
--- a/trunk/drivers/ide/ide-atapi.c
+++ b/trunk/drivers/ide/ide-atapi.c
@@ -302,8 +302,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,
 			   bcount, dma);
 
 	/* Issue the packet command */
-	if ((pc->flags & PC_FLAG_DRQ_INTERRUPT) ||
-	    (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT)) {
+	if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) {
 		ide_execute_command(drive, WIN_PACKETCMD, handler,
 				    timeout, NULL);
 		return ide_started;
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index 147bfee1fe70..d67ccca2b964 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -687,7 +687,6 @@ enum {
 	PC_FLAG_WRITING			= (1 << 6),
 	/* command timed out */
 	PC_FLAG_TIMEDOUT		= (1 << 7),
-	PC_FLAG_DRQ_INTERRUPT		= (1 << 8),
 };
 
 struct ide_atapi_pc {