diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 06:49:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 06:49:02 -0700 |
| commit | a2b9c1f6208126e6df6c02428c501f8853685812 (patch) | |
| tree | e36762d385bb490914a72485c4da4431e4b937d3 /drivers/s390 | |
| parent | 2e9521fd656f05a716b5294a7dbebd37ced05e43 (diff) | |
| parent | 3ec717b7ca4ee1d75d77e4f6286430d8f01d1dbd (diff) | |
| download | op-kernel-dev-a2b9c1f6208126e6df6c02428c501f8853685812.zip op-kernel-dev-a2b9c1f6208126e6df6c02428c501f8853685812.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: don't delay blk_run_queue_async
scsi: remove performance regression due to async queue run
blk-throttle: Use task_subsys_state() to determine a task's blkio_cgroup
block: rescan partitions on invalidated devices on -ENOMEDIA too
cdrom: always check_disk_change() on open
block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/char/tape_block.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c index 83cea9a55..1b3924c 100644 --- a/drivers/s390/char/tape_block.c +++ b/drivers/s390/char/tape_block.c @@ -236,7 +236,6 @@ tapeblock_setup_device(struct tape_device * device) disk->major = tapeblock_major; disk->first_minor = device->first_minor; disk->fops = &tapeblock_fops; - disk->events = DISK_EVENT_MEDIA_CHANGE; disk->private_data = tape_get_device(device); disk->queue = blkdat->request_queue; set_capacity(disk, 0); |
