diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/scsi/sd.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index b61ebec6bca7..bd0806e64e85 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -1055,7 +1055,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo) | |||
| 1055 | * @arg: this is third argument given to ioctl(2) system call. | 1055 | * @arg: this is third argument given to ioctl(2) system call. |
| 1056 | * Often contains a pointer. | 1056 | * Often contains a pointer. |
| 1057 | * | 1057 | * |
| 1058 | * Returns 0 if successful (some ioctls return postive numbers on | 1058 | * Returns 0 if successful (some ioctls return positive numbers on |
| 1059 | * success as well). Returns a negated errno value in case of error. | 1059 | * success as well). Returns a negated errno value in case of error. |
| 1060 | * | 1060 | * |
| 1061 | * Note: most ioctls are forward onto the block subsystem or further | 1061 | * Note: most ioctls are forward onto the block subsystem or further |