diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:41:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:41:44 -0400 |
commit | 7f06a8b26aba1dc03b42272dc0089a800372c575 (patch) | |
tree | 7c67198f83d069eb13fd417e022d111b7e4c82a1 /sound/soc/codecs/wm8960.h | |
parent | c3ad33c9bcb6616999953af76f16318120fe3691 (diff) | |
parent | d71f4cece4bd97d05592836202fc04ff2e7817e3 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (250 commits)
ALSA: hda: Storage class should be before const qualifier
ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies
ASoC: tpa6130a2: Define output pins with SND_SOC_DAPM_OUTPUT
ASoC: sdp4430 - add sdp4430 pcm ops to DAI.
ASoC: TWL6040: Enable earphone path in codec
ASoC: SDP4430: Add support for Earphone speaker
ASoC: SDP4430: Add sdp4430 machine driver
ASoC: tlv320dac33: Avoid powering off while in BIAS_OFF
ASoC: tlv320dac33: Use dev_dbg in dac33_hard_power function
ALSA: sound/pci/asihpi: Use kzalloc
ALSA: hdmi - dont fail on extra nodes
ALSA: intelhdmi - add id for the CougarPoint chipset
ALSA: intelhdmi - user friendly codec name
ALSA: intelhdmi - add dependency on SND_DYNAMIC_MINORS
ALSA: asihpi: incorrect range check
ALSA: asihpi: testing the wrong variable
ALSA: es1688: add pedantic range checks
ARM: McBSP: Add support for omap4 in McBSP driver
ARM: McBSP: Fix request for irq in OMAP4
OMAP: McBSP: Add 32-bit mode support
...
Diffstat (limited to 'sound/soc/codecs/wm8960.h')
-rw-r--r-- | sound/soc/codecs/wm8960.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sound/soc/codecs/wm8960.h b/sound/soc/codecs/wm8960.h index c9af56c9d9d4..a5ef65481b86 100644 --- a/sound/soc/codecs/wm8960.h +++ b/sound/soc/codecs/wm8960.h | |||
@@ -76,7 +76,6 @@ | |||
76 | #define WM8960_OPCLKDIV 2 | 76 | #define WM8960_OPCLKDIV 2 |
77 | #define WM8960_DCLKDIV 3 | 77 | #define WM8960_DCLKDIV 3 |
78 | #define WM8960_TOCLKSEL 4 | 78 | #define WM8960_TOCLKSEL 4 |
79 | #define WM8960_SYSCLKSEL 5 | ||
80 | 79 | ||
81 | #define WM8960_SYSCLK_DIV_1 (0 << 1) | 80 | #define WM8960_SYSCLK_DIV_1 (0 << 1) |
82 | #define WM8960_SYSCLK_DIV_2 (2 << 1) | 81 | #define WM8960_SYSCLK_DIV_2 (2 << 1) |
@@ -114,14 +113,4 @@ | |||
114 | extern struct snd_soc_dai wm8960_dai; | 113 | extern struct snd_soc_dai wm8960_dai; |
115 | extern struct snd_soc_codec_device soc_codec_dev_wm8960; | 114 | extern struct snd_soc_codec_device soc_codec_dev_wm8960; |
116 | 115 | ||
117 | #define WM8960_DRES_400R 0 | ||
118 | #define WM8960_DRES_200R 1 | ||
119 | #define WM8960_DRES_600R 2 | ||
120 | #define WM8960_DRES_150R 3 | ||
121 | #define WM8960_DRES_MAX 3 | ||
122 | |||
123 | struct wm8960_data { | ||
124 | int dres; | ||
125 | }; | ||
126 | |||
127 | #endif | 116 | #endif |