| commit | 9e3be1edbe5ca57df51140b523168237b3a01f4d | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Nov 02 09:58:49 2010 -0400 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue Nov 02 09:58:49 2010 -0400 |
| tree | a72c0ec1ce0fbcdcd12ecb6aad9bedcc94b94f9d | |
| parent | 473f89fff76568a9f30c53b458e6323d48b0ab95 [diff] [blame] | |
| parent | 29c798fecb9b846b363b0a02fa662ff42fc19426 [diff] [blame] |
Merge branch 'for-2.6.37' into HEAD WARN() fix from Joe moved. Conflicts: sound/soc/codecs/wm_hubs.c
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index 31c2a57..008b1f2 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c
@@ -130,7 +130,7 @@ reg_r = reg & WM8993_DCS_DAC_WR_VAL_0_MASK; break; default: - WARN(1, "Unknown DCS readback method"); + WARN(1, "Unknown DCS readback method\n"); break; }