diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-23 06:41:17 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-23 06:41:17 -0500 |
| commit | 9e8c32cac9929858337e29dd4e28fd87bc073ef5 (patch) | |
| tree | 81643da2131561b729a09adbbced293b008c6cbf /include/linux | |
| parent | 48c88e820fb3e35c5925e4743fd13f200891b7b5 (diff) | |
| parent | bf86f07e8479f4de20d8b19748482eccda240664 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/linux')
| -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 @@ | |||
| 522 | #define WM8350_MCLK_SEL_PLL_32K 3 | 522 | #define WM8350_MCLK_SEL_PLL_32K 3 |
| 523 | #define WM8350_MCLK_SEL_MCLK 5 | 523 | #define WM8350_MCLK_SEL_MCLK 5 |
| 524 | 524 | ||
| 525 | #define WM8350_MCLK_DIR_OUT 0 | ||
| 526 | #define WM8350_MCLK_DIR_IN 1 | ||
| 527 | |||
| 528 | /* clock divider id's */ | 525 | /* clock divider id's */ |
| 529 | #define WM8350_ADC_CLKDIV 0 | 526 | #define WM8350_ADC_CLKDIV 0 |
| 530 | #define WM8350_DAC_CLKDIV 1 | 527 | #define WM8350_DAC_CLKDIV 1 |