diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/arm/Makefile | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/arm/Makefile')
| -rw-r--r-- | sound/arm/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/arm/Makefile b/sound/arm/Makefile index 2054de11de8a..5a549ed6c8aa 100644 --- a/sound/arm/Makefile +++ b/sound/arm/Makefile | |||
| @@ -2,9 +2,6 @@ | |||
| 2 | # Makefile for ALSA | 2 | # Makefile for ALSA |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o | ||
| 6 | snd-sa11xx-uda1341-objs := sa11xx-uda1341.o | ||
| 7 | |||
| 8 | obj-$(CONFIG_SND_ARMAACI) += snd-aaci.o | 5 | obj-$(CONFIG_SND_ARMAACI) += snd-aaci.o |
| 9 | snd-aaci-objs := aaci.o devdma.o | 6 | snd-aaci-objs := aaci.o devdma.o |
| 10 | 7 | ||