Merge branch 'for-2.6.37' into for-2.6.38

This commit is contained in:
Mark Brown 2010-11-10 15:41:12 +00:00
commit 00fb0d98ad
2 changed files with 8 additions and 4 deletions

View file

@ -522,9 +522,6 @@
#define WM8350_MCLK_SEL_PLL_32K 3
#define WM8350_MCLK_SEL_MCLK 5
#define WM8350_MCLK_DIR_OUT 0
#define WM8350_MCLK_DIR_IN 1
/* clock divider id's */
#define WM8350_ADC_CLKDIV 0
#define WM8350_DAC_CLKDIV 1