From 20b4ef6e72c26750580547571a5145b80ae243d5 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Jun 2011 05:29:19 +0900
Subject: [PATCH] --- yaml --- r: 252959 b: refs/heads/master c:
 0f48f2600911d5de6393829e4a9986d4075558b3 h: refs/heads/master i:   252957:
 905a5448149542b8555000cdddbe22dfc7cb2749   252955:
 e7e196453f36a9ea5dd3e1c09bb2c43e4ccaa832   252951:
 275f7e13d4f2c58ec7e20fe5e421e7a6d6a87402   252943:
 83fff7861abc512211bab9048b8e2efca45cc51c   252927:
 107401c059f98d387849dcfdd8e0c0208f04e086 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/paride/pcd.c | 1 -
 trunk/drivers/cdrom/viocd.c      | 1 -
 trunk/drivers/ide/ide-cd.c       | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a7496a8e9a8e..5f98c68cdbe7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f303103b884ca577908d3e5c0650ad12e40c586
+refs/heads/master: 0f48f2600911d5de6393829e4a9986d4075558b3
diff --git a/trunk/drivers/block/paride/pcd.c b/trunk/drivers/block/paride/pcd.c
index a0aabd904a51..46b8136c31bb 100644
--- a/trunk/drivers/block/paride/pcd.c
+++ b/trunk/drivers/block/paride/pcd.c
@@ -321,7 +321,6 @@ static void pcd_init_units(void)
 		strcpy(disk->disk_name, cd->name);	/* umm... */
 		disk->fops = &pcd_bdops;
 		disk->flags = GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;
-		disk->events = DISK_EVENT_MEDIA_CHANGE;
 	}
 }
 
diff --git a/trunk/drivers/cdrom/viocd.c b/trunk/drivers/cdrom/viocd.c
index ae15a4ddaa9b..7878da89d29e 100644
--- a/trunk/drivers/cdrom/viocd.c
+++ b/trunk/drivers/cdrom/viocd.c
@@ -627,7 +627,6 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 	gendisk->fops = &viocd_fops;
 	gendisk->flags = GENHD_FL_CD | GENHD_FL_REMOVABLE |
 			 GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;
-	gendisk->events = DISK_EVENT_MEDIA_CHANGE;
 	set_capacity(gendisk, 0);
 	gendisk->private_data = d;
 	d->viocd_disk = gendisk;
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
index 6e5123b1d341..144d27261e43 100644
--- a/trunk/drivers/ide/ide-cd.c
+++ b/trunk/drivers/ide/ide-cd.c
@@ -1782,7 +1782,6 @@ static int ide_cd_probe(ide_drive_t *drive)
 	ide_cd_read_toc(drive, &sense);
 	g->fops = &idecd_ops;
 	g->flags |= GENHD_FL_REMOVABLE | GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;
-	g->events = DISK_EVENT_MEDIA_CHANGE;
 	add_disk(g);
 	return 0;