diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-10 16:41:12 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-10 16:41:12 +0100 |
commit | 00fb0d98add90480f60db2d1701ef2bb68a73797 (patch) | |
tree | be81fd6e8869e5550fc131958607f99d001e9096 /include | |
parent | ASoC: Convert pop_dbg to use dev_info (diff) | |
parent | ASoC: Ensure sane WM835x AIF configuration by default (diff) | |
download | linux-00fb0d98add90480f60db2d1701ef2bb68a73797.tar.xz linux-00fb0d98add90480f60db2d1701ef2bb68a73797.zip |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mfd/wm8350/audio.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/mfd/wm8350/audio.h b/include/linux/mfd/wm8350/audio.h index a95141eafce3..bd581c6fa085 100644 --- a/include/linux/mfd/wm8350/audio.h +++ b/include/linux/mfd/wm8350/audio.h @@ -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 |