diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2014-11-28 16:59:26 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-29 20:21:43 +0100 |
| commit | 1a4e39c2e5ca2eb494a53ecd73055562f690bca0 (patch) | |
| tree | fea6536942455fa186b45496fbf0fdc6fe0d4f3e /sound/firewire | |
| parent | ALSA: speakers: Rename to oxfw and rename some members (diff) | |
| download | linux-1a4e39c2e5ca2eb494a53ecd73055562f690bca0.tar.xz linux-1a4e39c2e5ca2eb494a53ecd73055562f690bca0.zip | |
ALSA: oxfw: Move to its own directory
Followed commits add much codes. To make the work easy, this commit creates
own directory and move current file to it.
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 | 2 | ||||
| -rw-r--r-- | sound/firewire/oxfw/Makefile | 2 | ||||
| -rw-r--r-- | sound/firewire/oxfw/oxfw.c (renamed from sound/firewire/oxfw.c) | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sound/firewire/Makefile b/sound/firewire/Makefile index 5ed6fb7bc979..8b37f084b2ab 100644 --- a/sound/firewire/Makefile +++ b/sound/firewire/Makefile @@ -6,7 +6,7 @@ snd-scs1x-objs := scs1x.o obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o obj-$(CONFIG_SND_DICE) += dice/ -obj-$(CONFIG_SND_OXFW) += snd-oxfw.o +obj-$(CONFIG_SND_OXFW) += oxfw/ obj-$(CONFIG_SND_ISIGHT) += snd-isight.o obj-$(CONFIG_SND_SCS1X) += snd-scs1x.o obj-$(CONFIG_SND_FIREWORKS) += fireworks/ diff --git a/sound/firewire/oxfw/Makefile b/sound/firewire/oxfw/Makefile new file mode 100644 index 000000000000..9ca49c0fdc40 --- /dev/null +++ b/sound/firewire/oxfw/Makefile @@ -0,0 +1,2 @@ +snd-oxfw-objs := oxfw.o +obj-m += snd-oxfw.o diff --git a/sound/firewire/oxfw.c b/sound/firewire/oxfw/oxfw.c index b7498e9420d8..55c687ef3247 100644 --- a/sound/firewire/oxfw.c +++ b/sound/firewire/oxfw/oxfw.c @@ -17,10 +17,10 @@ #include <sound/initval.h> #include <sound/pcm.h> #include <sound/pcm_params.h> -#include "cmp.h" -#include "fcp.h" -#include "amdtp.h" -#include "lib.h" +#include "../cmp.h" +#include "../fcp.h" +#include "../amdtp.h" +#include "../lib.h" #define OXFORD_FIRMWARE_ID_ADDRESS (CSR_REGISTER_BASE + 0x50000) /* 0x970?vvvv or 0x971?vvvv, where vvvv = firmware version */ |