diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-04 13:38:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-04 13:38:31 -0700 |
| commit | e990b37b906b6137d353ef2a918e15e5763d70ec (patch) | |
| tree | e802458ee43d4b0a2b6d39eb25929858ceb7fd61 /drivers/cdrom/viocd.c | |
| parent | 34624d6631b6b3a1df16407a847286bb6233a96b (diff) | |
| parent | 23c79d31a3dd2602ee1a5ff31303b2d7a2d3c159 (diff) | |
| download | kernel_replicant_linux-e990b37b906b6137d353ef2a918e15e5763d70ec.tar.gz kernel_replicant_linux-e990b37b906b6137d353ef2a918e15e5763d70ec.tar.bz2 kernel_replicant_linux-e990b37b906b6137d353ef2a918e15e5763d70ec.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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; |