diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 10:47:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 10:47:46 -0500 |
| commit | a421018e8c10e5593a1fee076af72a66c3fe8ca3 (patch) | |
| tree | 2854511845d0e07d33726a13eda6de1059a5c9df /sound/soc/omap/ams-delta.c | |
| parent | 3ad1f3b35e8309ec93454dbf89beaafcdb5312da (diff) | |
| parent | 86e1d57e4f24ca27ce813bdc2afaac4adafcbaf4 (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: (294 commits)
S3C64XX: Staticise platform data for PCM devices
ASoC: Rename controls with a / in wm_hubs
snd-fm801: autodetect SF64-PCR (tuner-only) card
ALSA: tea575x-tuner: fix mute
ASoC: au1x: dbdma2: plug memleak in pcm device creation error path
ASoC: au1x: dbdma2: fix oops on soc device removal.
ALSA: hda - Fix memory leaks in the previous patch
ALSA: hda - Add ALC661/259, ALC892/888VD support
ALSA: opti9xx: remove snd_opti9xx fields
ALSA: aaci - Clean up duplicate code
ALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT
ALSA: hda - Add position_fix quirk for HP dv3
ALSA: hda - Add a pin-fix for FSC Amilo Pi1505
ALSA: hda - Fix Cxt5047 test mode
ASoC: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
ASoC: sh: fsi: Add runtime PM support
sh: ms7724se: Add runtime PM support for FSI
ALSA: hda - Add a position_fix quirk for MSI Wind U115
ALSA: opti-miro: add PnP detection
ALSA: opti-miro: separate comon probing code
...
Diffstat (limited to 'sound/soc/omap/ams-delta.c')
| -rw-r--r-- | sound/soc/omap/ams-delta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 5a5166ac7279..ae0fc9b135d4 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | /* Board specific DAPM widgets */ | 42 | /* Board specific DAPM widgets */ |
| 43 | const struct snd_soc_dapm_widget ams_delta_dapm_widgets[] = { | 43 | static const struct snd_soc_dapm_widget ams_delta_dapm_widgets[] = { |
| 44 | /* Handset */ | 44 | /* Handset */ |
| 45 | SND_SOC_DAPM_MIC("Mouthpiece", NULL), | 45 | SND_SOC_DAPM_MIC("Mouthpiece", NULL), |
| 46 | SND_SOC_DAPM_HP("Earpiece", NULL), | 46 | SND_SOC_DAPM_HP("Earpiece", NULL), |
| @@ -81,7 +81,7 @@ static const char *ams_delta_audio_mode[] = | |||
| 81 | (1 << AMS_DELTA_SPEAKER)) | 81 | (1 << AMS_DELTA_SPEAKER)) |
| 82 | #define AMS_DELTA_SPEAKERPHONE (AMS_DELTA_HANDSFREE | (1 << AMS_DELTA_AGC)) | 82 | #define AMS_DELTA_SPEAKERPHONE (AMS_DELTA_HANDSFREE | (1 << AMS_DELTA_AGC)) |
| 83 | 83 | ||
| 84 | unsigned short ams_delta_audio_mode_pins[] = { | 84 | static const unsigned short ams_delta_audio_mode_pins[] = { |
| 85 | AMS_DELTA_MIXED, | 85 | AMS_DELTA_MIXED, |
| 86 | AMS_DELTA_HANDSET, | 86 | AMS_DELTA_HANDSET, |
| 87 | AMS_DELTA_HANDSFREE, | 87 | AMS_DELTA_HANDSFREE, |