diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 14:16:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 14:16:27 -0400 |
| commit | e349792a385ed47390d156155b1a1e19af1bf163 (patch) | |
| tree | f9dc4e3e42769950230eaa58ecdd056eb27b23e8 /sound/soc/omap/Makefile | |
| parent | 6d21491838a2a9f22843c7530b118596ee9f4d77 (diff) | |
| parent | e3f86d3d3ce350144562d9bd035dc8a274fce58e (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: (290 commits)
ALSA: pcm - Update document about xrun_debug proc file
ALSA: lx6464es - support standard alsa module parameters
ALSA: snd_usb_caiaq: set mixername
ALSA: hda - add quirk for STAC92xx (SigmaTel STAC9205)
ALSA: use card device as parent for jack input-devices
ALSA: sound/ps3: Correct existing and add missing annotations
ALSA: sound/ps3: Restructure driver source
ALSA: sound/ps3: Fix checkpatch issues
ASoC: Fix lm4857 control
ALSA: ctxfi - Clear PCM resources at hw_params and hw_free
ALSA: ctxfi - Check the presence of SRC instance in PCM pointer callbacks
ALSA: ctxfi - Add missing start check in atc_pcm_playback_start()
ALSA: ctxfi - Add use_system_timer module option
ALSA: usb - Add boot quirk for C-Media 6206 USB Audio
ALSA: ctxfi - Fix wrong model id for UAA
ALSA: ctxfi - Clean up probe routines
ALSA: hda - Fix the previous tagra-8ch patch
ALSA: hda - Add 7.1 support for MSI GX620
ALSA: pcm - A helper function to compose PCM stream name for debug prints
ALSA: emu10k1 - Fix minimum periods for efx playback
...
Diffstat (limited to 'sound/soc/omap/Makefile')
| -rw-r--r-- | sound/soc/omap/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 0c9e4ac3766..a37f4986238 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile | |||
| @@ -10,6 +10,7 @@ snd-soc-n810-objs := n810.o | |||
| 10 | snd-soc-osk5912-objs := osk5912.o | 10 | snd-soc-osk5912-objs := osk5912.o |
| 11 | snd-soc-overo-objs := overo.o | 11 | snd-soc-overo-objs := overo.o |
| 12 | snd-soc-omap2evm-objs := omap2evm.o | 12 | snd-soc-omap2evm-objs := omap2evm.o |
| 13 | snd-soc-omap3evm-objs := omap3evm.o | ||
| 13 | snd-soc-sdp3430-objs := sdp3430.o | 14 | snd-soc-sdp3430-objs := sdp3430.o |
| 14 | snd-soc-omap3pandora-objs := omap3pandora.o | 15 | snd-soc-omap3pandora-objs := omap3pandora.o |
| 15 | snd-soc-omap3beagle-objs := omap3beagle.o | 16 | snd-soc-omap3beagle-objs := omap3beagle.o |
| @@ -18,6 +19,7 @@ obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o | |||
| 18 | obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o | 19 | obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o |
| 19 | obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o | 20 | obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o |
| 20 | obj-$(CONFIG_MACH_OMAP2EVM) += snd-soc-omap2evm.o | 21 | obj-$(CONFIG_MACH_OMAP2EVM) += snd-soc-omap2evm.o |
| 22 | obj-$(CONFIG_MACH_OMAP3EVM) += snd-soc-omap3evm.o | ||
| 21 | obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o | 23 | obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o |
| 22 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o | 24 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o |
| 23 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o | 25 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o |