diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-22 04:02:57 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-22 04:02:57 -0400 |
| commit | 861e66d3418a90f57b31a50110fc70b23569c551 (patch) | |
| tree | ffa0d5bf8dc3e4b82b88d8942390a11d827423f9 /sound/firewire/Makefile | |
| parent | b55447a7301b12d509df4b2909ed38d125ad83d4 (diff) | |
| parent | b20be8de1b3972ccf9af72850b045214faa8d830 (diff) | |
Merge branch 'dice-driver-playback-only' of git://git.alsa-project.org/alsa-kprivate into for-next
Diffstat (limited to 'sound/firewire/Makefile')
| -rw-r--r-- | sound/firewire/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/firewire/Makefile b/sound/firewire/Makefile index 460179df5bb5..509955061d30 100644 --- a/sound/firewire/Makefile +++ b/sound/firewire/Makefile | |||
| @@ -1,10 +1,12 @@ | |||
| 1 | snd-firewire-lib-objs := lib.o iso-resources.o packets-buffer.o \ | 1 | snd-firewire-lib-objs := lib.o iso-resources.o packets-buffer.o \ |
| 2 | fcp.o cmp.o amdtp.o | 2 | fcp.o cmp.o amdtp.o |
| 3 | snd-dice-objs := dice.o | ||
| 3 | snd-firewire-speakers-objs := speakers.o | 4 | snd-firewire-speakers-objs := speakers.o |
| 4 | snd-isight-objs := isight.o | 5 | snd-isight-objs := isight.o |
| 5 | snd-scs1x-objs := scs1x.o | 6 | snd-scs1x-objs := scs1x.o |
| 6 | 7 | ||
| 7 | obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o | 8 | obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o |
| 9 | obj-$(CONFIG_SND_DICE) += snd-dice.o | ||
| 8 | obj-$(CONFIG_SND_FIREWIRE_SPEAKERS) += snd-firewire-speakers.o | 10 | obj-$(CONFIG_SND_FIREWIRE_SPEAKERS) += snd-firewire-speakers.o |
| 9 | obj-$(CONFIG_SND_ISIGHT) += snd-isight.o | 11 | obj-$(CONFIG_SND_ISIGHT) += snd-isight.o |
| 10 | obj-$(CONFIG_SND_SCS1X) += snd-scs1x.o | 12 | obj-$(CONFIG_SND_SCS1X) += snd-scs1x.o |