diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2014-11-29 00:59:12 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-29 20:03:45 +0100 |
| commit | 14ff6a094815988b018ea4d698c2e2cc3ceee27c (patch) | |
| tree | 958e9fbff9372504d75f84fb1e03354f037973df /sound/firewire | |
| parent | 732d153fbeac1774393508b3cec4b1d09e567585 (diff) | |
| download | op-kernel-dev-14ff6a094815988b018ea4d698c2e2cc3ceee27c.zip op-kernel-dev-14ff6a094815988b018ea4d698c2e2cc3ceee27c.tar.gz | |
ALSA: dice: Move file to its own directory
In followed commits, dice driver is split into several files. For easily
managing these files, this commit adds subdirectory and move file into
the directory.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/Makefile | 3 | ||||
| -rw-r--r-- | sound/firewire/dice/Makefile | 2 | ||||
| -rw-r--r-- | sound/firewire/dice/dice-interface.h (renamed from sound/firewire/dice-interface.h) | 0 | ||||
| -rw-r--r-- | sound/firewire/dice/dice.c (renamed from sound/firewire/dice.c) | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/sound/firewire/Makefile b/sound/firewire/Makefile index fad8d49..c50761c 100644 --- a/sound/firewire/Makefile +++ b/sound/firewire/Makefile @@ -1,12 +1,11 @@ snd-firewire-lib-objs := lib.o iso-resources.o packets-buffer.o \ fcp.o cmp.o amdtp.o -snd-dice-objs := dice.o snd-firewire-speakers-objs := speakers.o snd-isight-objs := isight.o snd-scs1x-objs := scs1x.o obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o -obj-$(CONFIG_SND_DICE) += snd-dice.o +obj-$(CONFIG_SND_DICE) += dice/ obj-$(CONFIG_SND_FIREWIRE_SPEAKERS) += snd-firewire-speakers.o obj-$(CONFIG_SND_ISIGHT) += snd-isight.o obj-$(CONFIG_SND_SCS1X) += snd-scs1x.o diff --git a/sound/firewire/dice/Makefile b/sound/firewire/dice/Makefile new file mode 100644 index 0000000..af05d7e --- /dev/null +++ b/sound/firewire/dice/Makefile @@ -0,0 +1,2 @@ +snd-dice-objs := dice.o +obj-m += snd-dice.o diff --git a/sound/firewire/dice-interface.h b/sound/firewire/dice/dice-interface.h index 27b044f..27b044f 100644 --- a/sound/firewire/dice-interface.h +++ b/sound/firewire/dice/dice-interface.h diff --git a/sound/firewire/dice.c b/sound/firewire/dice/dice.c index eafd74b..d3ec778 100644 --- a/sound/firewire/dice.c +++ b/sound/firewire/dice/dice.c @@ -26,9 +26,9 @@ #include <sound/initval.h> #include <sound/pcm.h> #include <sound/pcm_params.h> -#include "amdtp.h" -#include "iso-resources.h" -#include "lib.h" +#include "../amdtp.h" +#include "../iso-resources.h" +#include "../lib.h" #include "dice-interface.h" |
