diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 03:36:17 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 03:36:17 -0500 |
| commit | 0e44e059588e1d91f3a1974d2ce3348864d1d799 (patch) | |
| tree | 1161c2508bd9eeab010ebc40ef87860fd85a35fd /include/linux/mfd/wm8350/audio.h | |
| parent | 96886c4361f1ae3f6c775d7c9295e2d557101d0f (diff) | |
| parent | e8a7e48bb248a1196484d3f8afa53bded2b24e71 (diff) | |
Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
Done to resolve merge conflict:
Conflicts:
arch/arm/mach-mx25/devices-imx25.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include/linux/mfd/wm8350/audio.h')
| -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 |