diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 11:41:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 11:41:58 -0400 |
| commit | 7b70888a192eff457c2ca0a4ffa04815f5e19734 (patch) | |
| tree | 8c75d6908b1e83b750b50e7a26da867926e0f5cd /sound/arm/Makefile | |
| parent | cd85c8b4457a52d3545fdb9532082b2c1ebd5f21 (diff) | |
| parent | 0a97af41b0e77f834acc0870155de616a373e899 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/arm/Makefile')
| -rw-r--r-- | sound/arm/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/arm/Makefile b/sound/arm/Makefile index f74ec28e1068..103f136926d9 100644 --- a/sound/arm/Makefile +++ b/sound/arm/Makefile | |||
| @@ -3,9 +3,11 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | snd-sa11xx-uda1341-objs := sa11xx-uda1341.o | 5 | snd-sa11xx-uda1341-objs := sa11xx-uda1341.o |
| 6 | snd-aaci-objs := aaci.o devdma.o | ||
| 7 | snd-pxa2xx-pcm-objs := pxa2xx-pcm.o | ||
| 8 | snd-pxa2xx-ac97-objs := pxa2xx-ac97.o | ||
| 6 | 9 | ||
| 7 | # Toplevel Module Dependency | ||
| 8 | obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o | 10 | obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o |
| 9 | |||
| 10 | obj-$(CONFIG_SND_ARMAACI) += snd-aaci.o | 11 | obj-$(CONFIG_SND_ARMAACI) += snd-aaci.o |
| 11 | snd-aaci-objs := aaci.o devdma.o | 12 | obj-$(CONFIG_SND_PXA2XX_PCM) += snd-pxa2xx-pcm.o |
| 13 | obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o | ||