diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2011-05-19 01:36:21 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2011-05-19 01:36:21 -0400 |
| commit | 134c428e5a31f2d5ed3a70ba20dac83895ec8b82 (patch) | |
| tree | 0fb28accbf09171b8a1ca792361f4160434529e8 /drivers/block/paride/pd.c | |
| parent | a0496d450ab8c17f6c4d86979b1f6ba486fe9365 (diff) | |
| parent | c560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 (diff) | |
Merge remote branch 'benh/merge' into benh-next
Diffstat (limited to 'drivers/block/paride/pd.c')
| -rw-r--r-- | drivers/block/paride/pd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index 21dfdb776869..869e7676d46f 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c | |||
| @@ -837,7 +837,6 @@ static void pd_probe_drive(struct pd_unit *disk) | |||
| 837 | p->fops = &pd_fops; | 837 | p->fops = &pd_fops; |
| 838 | p->major = major; | 838 | p->major = major; |
| 839 | p->first_minor = (disk - pd) << PD_BITS; | 839 | p->first_minor = (disk - pd) << PD_BITS; |
| 840 | p->events = DISK_EVENT_MEDIA_CHANGE; | ||
| 841 | disk->gd = p; | 840 | disk->gd = p; |
| 842 | p->private_data = disk; | 841 | p->private_data = disk; |
| 843 | p->queue = pd_queue; | 842 | p->queue = pd_queue; |