diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:16:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:16:25 +0200 |
| commit | cb2e3d461b26f07540e0b898e0125137def2b015 (patch) | |
| tree | a7d3c7f79bd26b15806565405522c7c7c0da44db /sound/soc/atmel/atmel-classd.c | |
| parent | d30eed1cd2b17f6140ec443f22a8e32f99cd99c1 (diff) | |
| parent | a71c9a1c779f2499fb2afc0553e543f18aff6edf (diff) | |
| download | linux-rt-cb2e3d461b26f07540e0b898e0125137def2b015.tar.gz | |
Merge 4.11-rc5 into usb-next
We want the usb fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/atmel/atmel-classd.c')
| -rw-r--r-- | sound/soc/atmel/atmel-classd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c index 89ac5f5a93eb..7ae46c2647d4 100644 --- a/sound/soc/atmel/atmel-classd.c +++ b/sound/soc/atmel/atmel-classd.c @@ -349,7 +349,7 @@ static int atmel_classd_codec_dai_digital_mute(struct snd_soc_dai *codec_dai, } #define CLASSD_ACLK_RATE_11M2896_MPY_8 (112896 * 100 * 8) -#define CLASSD_ACLK_RATE_12M288_MPY_8 (12228 * 1000 * 8) +#define CLASSD_ACLK_RATE_12M288_MPY_8 (12288 * 1000 * 8) static struct { int rate; |