소스 검색

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 11 년 전
부모
커밋
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"