浏览代码

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>
Takashi Sakamoto 10 年之前
父节点
当前提交
14ff6a0948
共有 4 个文件被更改,包括 6 次插入5 次删除
  1. 1 2
      sound/firewire/Makefile
  2. 2 0
      sound/firewire/dice/Makefile
  3. 0 0
      sound/firewire/dice/dice-interface.h
  4. 3 3
      sound/firewire/dice/dice.c

+ 1 - 2
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

+ 2 - 0
sound/firewire/dice/Makefile

@@ -0,0 +1,2 @@
+snd-dice-objs := dice.o
+obj-m += snd-dice.o

+ 0 - 0
sound/firewire/dice-interface.h → sound/firewire/dice/dice-interface.h


+ 3 - 3
sound/firewire/dice.c → 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"