diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/scsi/sr.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index aefadc6a1607..95019c747cc1 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -567,7 +567,7 @@ static const struct block_device_operations sr_bdops = | |||
| 567 | .revalidate_disk = sr_block_revalidate_disk, | 567 | .revalidate_disk = sr_block_revalidate_disk, |
| 568 | /* | 568 | /* |
| 569 | * No compat_ioctl for now because sr_block_ioctl never | 569 | * No compat_ioctl for now because sr_block_ioctl never |
| 570 | * seems to pass arbitary ioctls down to host drivers. | 570 | * seems to pass arbitrary ioctls down to host drivers. |
| 571 | */ | 571 | */ |
| 572 | }; | 572 | }; |
| 573 | 573 | ||