diff --git a/[refs] b/[refs]
index dc3a16e36bd8..57325d1231f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1b1cd9a23dfa9b33267519ee7c228da708ddaf6
+refs/heads/master: 906ef986a71d541a726550fa40dcbc5c356f810e
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index 13deba5e0157..a7dbfd857115 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -426,13 +426,9 @@ struct ide_atapi_pc {
 	struct idetape_bh *bh;
 	char *b_data;
 
-	/* idescsi only for now */
 	struct scatterlist *sg;
 	unsigned int sg_cnt;
 
-	struct scsi_cmnd *scsi_cmd;
-	void (*done) (struct scsi_cmnd *);
-
 	unsigned long timeout;
 };