diff options
author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2014-11-28 10:59:26 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-11-29 14:21:43 -0500 |
commit | 1a4e39c2e5ca2eb494a53ecd73055562f690bca0 (patch) | |
tree | fea6536942455fa186b45496fbf0fdc6fe0d4f3e | |
parent | 8832c5a74ba3506c51b6637ac78941fcd21afbef (diff) |
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>
-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 | |||
6 | 6 | ||
7 | obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o | 7 | obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o |
8 | obj-$(CONFIG_SND_DICE) += dice/ | 8 | obj-$(CONFIG_SND_DICE) += dice/ |
9 | obj-$(CONFIG_SND_OXFW) += snd-oxfw.o | 9 | obj-$(CONFIG_SND_OXFW) += oxfw/ |
10 | obj-$(CONFIG_SND_ISIGHT) += snd-isight.o | 10 | obj-$(CONFIG_SND_ISIGHT) += snd-isight.o |
11 | obj-$(CONFIG_SND_SCS1X) += snd-scs1x.o | 11 | obj-$(CONFIG_SND_SCS1X) += snd-scs1x.o |
12 | obj-$(CONFIG_SND_FIREWORKS) += fireworks/ | 12 | 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 @@ | |||
1 | snd-oxfw-objs := oxfw.o | ||
2 | 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 @@ | |||
17 | #include <sound/initval.h> | 17 | #include <sound/initval.h> |
18 | #include <sound/pcm.h> | 18 | #include <sound/pcm.h> |
19 | #include <sound/pcm_params.h> | 19 | #include <sound/pcm_params.h> |
20 | #include "cmp.h" | 20 | #include "../cmp.h" |
21 | #include "fcp.h" | 21 | #include "../fcp.h" |
22 | #include "amdtp.h" | 22 | #include "../amdtp.h" |
23 | #include "lib.h" | 23 | #include "../lib.h" |
24 | 24 | ||
25 | #define OXFORD_FIRMWARE_ID_ADDRESS (CSR_REGISTER_BASE + 0x50000) | 25 | #define OXFORD_FIRMWARE_ID_ADDRESS (CSR_REGISTER_BASE + 0x50000) |
26 | /* 0x970?vvvv or 0x971?vvvv, where vvvv = firmware version */ | 26 | /* 0x970?vvvv or 0x971?vvvv, where vvvv = firmware version */ |