diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 06:22:54 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 06:22:54 -0500 |
| commit | a1926d1745114789687ac029ae8c58944b7d2256 (patch) | |
| tree | c303e75615e378451a80b97bfd2c1ba54029d9bb /sound/soc/codecs/max98088.c | |
| parent | 492e917635a0fa05439bb562fd51577efc9cef30 (diff) | |
| parent | 52fc43f7c1c416b114e88ff39635c36e67ef15b6 (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/codecs/max98088.c')
| -rw-r--r-- | sound/soc/codecs/max98088.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index b6ecc7e89673..bd0517cb7980 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c | |||
| @@ -1958,7 +1958,7 @@ static int max98088_probe(struct snd_soc_codec *codec) | |||
| 1958 | return ret; | 1958 | return ret; |
| 1959 | } | 1959 | } |
| 1960 | 1960 | ||
| 1961 | /* initalize private data */ | 1961 | /* initialize private data */ |
| 1962 | 1962 | ||
| 1963 | max98088->sysclk = (unsigned)-1; | 1963 | max98088->sysclk = (unsigned)-1; |
| 1964 | max98088->eq_textcnt = 0; | 1964 | max98088->eq_textcnt = 0; |