diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /sound/soc/ep93xx/snappercl15.c | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'sound/soc/ep93xx/snappercl15.c')
| -rw-r--r-- | sound/soc/ep93xx/snappercl15.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c index ccae34a3f280..a193cea3cf3c 100644 --- a/sound/soc/ep93xx/snappercl15.c +++ b/sound/soc/ep93xx/snappercl15.c | |||
| @@ -103,9 +103,7 @@ static int __devinit snappercl15_probe(struct platform_device *pdev) | |||
| 103 | struct snd_soc_card *card = &snd_soc_snappercl15; | 103 | struct snd_soc_card *card = &snd_soc_snappercl15; |
| 104 | int ret; | 104 | int ret; |
| 105 | 105 | ||
| 106 | ret = ep93xx_i2s_acquire(EP93XX_SYSCON_DEVCFG_I2SONAC97, | 106 | ret = ep93xx_i2s_acquire(); |
| 107 | EP93XX_SYSCON_I2SCLKDIV_ORIDE | | ||
| 108 | EP93XX_SYSCON_I2SCLKDIV_SPOL); | ||
| 109 | if (ret) | 107 | if (ret) |
| 110 | return ret; | 108 | return ret; |
| 111 | 109 | ||