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/block/DAC960.c | |
| parent | 2e9521fd656f05a716b5294a7dbebd37ced05e43 (diff) | |
| parent | 3ec717b7ca4ee1d75d77e4f6286430d8f01d1dbd (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blocklatest
* '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/block/DAC960.c')
| -rw-r--r-- | drivers/block/DAC960.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 8066d086578a..e086fbbbe853 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c @@ -2547,7 +2547,6 @@ static bool DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller) disk->major = MajorNumber; disk->first_minor = n << DAC960_MaxPartitionsBits; disk->fops = &DAC960_BlockDeviceOperations; - disk->events = DISK_EVENT_MEDIA_CHANGE; } /* Indicate the Block Device Registration completed successfully, |