diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:46:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:46:37 -0400 |
| commit | d3e458d78167102cc961237cfceef6fffc80c0b3 (patch) | |
| tree | e9195c1294daf053614e63ac52b0b44a28479017 /sound/soc/samsung/Kconfig | |
| parent | f2e1fbb5f2177227f71c4fc0491e531dd7acd385 (diff) | |
| parent | d351cf4603edb2a5bfa9a48d06c425511c63f2a3 (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: (308 commits)
ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl
ALSA: aloop - Fix possible IRQ lock inversion
ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail()
ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination
ALSA: firewire - msleep needs delay.h
ALSA: firewire-lib, firewire-speakers: handle packet queueing errors
ALSA: firewire-lib: allocate DMA buffer separately
ALSA: firewire-lib: use no-info SYT for packets without SYT sample
ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver
ALSA: hda - Remove an unused variable in patch_realtek.c
ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs
ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs
ALSA: hda - Move default input-src selection to init part
ALSA: hda - Initialize special cases for input src in init phase
ALSA: ctxfi - Clear input settings before initialization
ALSA: ctxfi - Fix SPDIF status retrieval
ALSA: ctxfi - Fix incorrect SPDIF status bit mask
ALSA: ctxfi - Fix microphone boost codes/comments
ALSA: atiixp - Fix wrong time-out checks during ac-link reset
ALSA: intel8x0m: append 'm' to "r_intel8x0"
...
Diffstat (limited to 'sound/soc/samsung/Kconfig')
| -rw-r--r-- | sound/soc/samsung/Kconfig | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index d6713d5a90e7..a3fdfb631469 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig | |||
| @@ -35,23 +35,16 @@ config SND_SAMSUNG_I2S | |||
| 35 | tristate | 35 | tristate |
| 36 | 36 | ||
| 37 | config SND_SOC_SAMSUNG_NEO1973_WM8753 | 37 | config SND_SOC_SAMSUNG_NEO1973_WM8753 |
| 38 | tristate "SoC I2S Audio support for NEO1973 - WM8753" | 38 | tristate "Audio support for Openmoko Neo1973 Smartphones (GTA01/GTA02)" |
| 39 | depends on SND_SOC_SAMSUNG && MACH_NEO1973_GTA01 | 39 | depends on SND_SOC_SAMSUNG && (MACH_NEO1973_GTA01 || MACH_NEO1973_GTA02) |
| 40 | select SND_S3C24XX_I2S | 40 | select SND_S3C24XX_I2S |
| 41 | select SND_SOC_WM8753 | 41 | select SND_SOC_WM8753 |
| 42 | select SND_SOC_LM4857 if MACH_NEO1973_GTA01 | ||
| 43 | select SND_SOC_DFBMCS320 | ||
| 42 | help | 44 | help |
| 43 | Say Y if you want to add support for SoC audio on smdk2440 | 45 | Say Y here to enable audio support for the Openmoko Neo1973 |
| 44 | with the WM8753. | 46 | Smartphones. |
| 45 | 47 | ||
| 46 | config SND_SOC_SAMSUNG_NEO1973_GTA02_WM8753 | ||
| 47 | tristate "Audio support for the Openmoko Neo FreeRunner (GTA02)" | ||
| 48 | depends on SND_SOC_SAMSUNG && MACH_NEO1973_GTA02 | ||
| 49 | select SND_S3C24XX_I2S | ||
| 50 | select SND_SOC_WM8753 | ||
| 51 | help | ||
| 52 | This driver provides audio support for the Openmoko Neo FreeRunner | ||
| 53 | smartphone. | ||
| 54 | |||
| 55 | config SND_SOC_SAMSUNG_JIVE_WM8750 | 48 | config SND_SOC_SAMSUNG_JIVE_WM8750 |
| 56 | tristate "SoC I2S Audio support for Jive" | 49 | tristate "SoC I2S Audio support for Jive" |
| 57 | depends on SND_SOC_SAMSUNG && MACH_JIVE | 50 | depends on SND_SOC_SAMSUNG && MACH_JIVE |