diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-10-15 14:13:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-16 14:14:31 +0900 |
| commit | 05304949332c6d2c7b50f2d0f666a52369f09ced (patch) | |
| tree | fbdb3e5c716dafee574b8a089a1cba048761bdab /COPYING | |
| parent | 39013bd60e79148961583402ed70bd105f95d260 (diff) | |
| download | linux-05304949332c6d2c7b50f2d0f666a52369f09ced.tar.bz2 | |
ASoC: ux500_msp_i2s: Fix devm_* and return code merge error
Some ux500_msp_i2s patches clashed with:
b18e93a493626c1446f9788ebd5844d008bbf71c
ASoC: ux500_msp_i2s: better use devm functions and fix error return code
... leaving the driver uncompilable. This patch fixes the
issues encountered.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions