diff options
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 fad8d49306a..c50761ccd66 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 00000000000..af05d7e9119 --- /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 27b044f84c8..27b044f84c8 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 eafd74b9737..d3ec778878a 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" |