diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:28:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:28:05 +0200 |
| commit | 3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4 (patch) | |
| tree | 58fbef582846fef0e777b1a552aca12e21a071b1 /drivers/cdrom/viocd.c | |
| parent | aef29bf20bd79c73992ab23d5067e9f0448b466e (diff) | |
| parent | aa4a221875873d2a1f9656cb7fd7e545e952b4fa (diff) | |
| download | blackbird-op-linux-3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4.tar.gz blackbird-op-linux-3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4.zip | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/python.c
Merge reason: resolve the conflict with perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/cdrom/viocd.c')
| -rw-r--r-- | drivers/cdrom/viocd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index ae15a4ddaa9b..7878da89d29e 100644 --- a/drivers/cdrom/viocd.c +++ b/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; |
