Merge branch 'topic/asoc' into for-linus

2009-03-24 00:35:53 +01:00
parent ff4fc3656e 1f2186951e
commit b5c784894c
130 changed files with 8678 additions and 3645 deletions
--- a/include/linux/mfd/wm8350/audio.h
+++ b/include/linux/mfd/wm8350/audio.h
@@ -490,6 +490,7 @@
 /*
 * R231 (0xE7) - Jack Status
 */
+#define WM8350_JACK_L_LVL			0x0800
 #define WM8350_JACK_R_LVL                       0x0400

 /*
--- a/include/linux/mfd/wm8400-audio.h
+++ b/include/linux/mfd/wm8400-audio.h
@@ -1181,6 +1181,7 @@
 #define WM8400_FLL_OUTDIV_SHIFT                      0  /* FLL_OUTDIV - [2:0] */
 #define WM8400_FLL_OUTDIV_WIDTH                      3  /* FLL_OUTDIV - [2:0] */

+struct wm8400;
 void wm8400_reset_codec_reg_cache(struct wm8400 *wm8400);

 #endif