X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Fscsi%2Fsd.h;h=4f032d48cb6ec9a14b9dc2d0632981accfb0f592;hb=e098675635479e9267cf2b12fb969c463cf506ab;hp=f7513313ef0d5d5bdd85194dfb6771ac294cc22d;hpb=c4ec20717313daafba59225f812db89595952b83;p=~andy%2Flinux

diff --git a/include/scsi/sd.h b/include/scsi/sd.h
index f7513313ef0..4f032d48cb6 100644
--- a/include/scsi/sd.h
+++ b/include/scsi/sd.h
@@ -34,18 +34,19 @@
 struct scsi_disk {
 	struct scsi_driver *driver;	/* always &sd_template */
 	struct scsi_device *device;
-	struct class_device cdev;
+	struct device	dev;
 	struct gendisk	*disk;
 	unsigned int	openers;	/* protected by BKL for now, yuck */
 	sector_t	capacity;	/* size in 512-byte sectors */
 	u32		index;
 	u8		media_present;
 	u8		write_prot;
+	unsigned	previous_state : 1;
 	unsigned	WCE : 1;	/* state of disk WCE bit */
 	unsigned	RCD : 1;	/* state of disk RCD bit, unused */
 	unsigned	DPOFUA : 1;	/* state of disk DPOFUA bit */
 };
-#define to_scsi_disk(obj) container_of(obj,struct scsi_disk,cdev)
+#define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev)
 
 #define sd_printk(prefix, sdsk, fmt, a...)				\
         (sdsk)->disk ?							\