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/wd33c93.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/wd33c93.c')
| -rw-r--r-- | drivers/scsi/wd33c93.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c index 5f697e0bd009..4468ae3610f7 100644 --- a/drivers/scsi/wd33c93.c +++ b/drivers/scsi/wd33c93.c | |||
| @@ -1843,7 +1843,7 @@ check_setup_args(char *key, int *flags, int *val, char *buf) | |||
| 1843 | * | 1843 | * |
| 1844 | * The original driver used to rely on a fixed sx_table, containing periods | 1844 | * The original driver used to rely on a fixed sx_table, containing periods |
| 1845 | * for (only) the lower limits of the respective input-clock-frequency ranges | 1845 | * for (only) the lower limits of the respective input-clock-frequency ranges |
| 1846 | * (8-10/12-15/16-20 MHz). Although it seems, that no problems ocurred with | 1846 | * (8-10/12-15/16-20 MHz). Although it seems, that no problems occurred with |
| 1847 | * this setting so far, it might be desirable to adjust the transfer periods | 1847 | * this setting so far, it might be desirable to adjust the transfer periods |
| 1848 | * closer to the really attached, possibly 25% higher, input-clock, since | 1848 | * closer to the really attached, possibly 25% higher, input-clock, since |
| 1849 | * - the wd33c93 may really use a significant shorter period, than it has | 1849 | * - the wd33c93 may really use a significant shorter period, than it has |