From 1a4e39c2e5ca2eb494a53ecd73055562f690bca0 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sat, 29 Nov 2014 00:59:26 +0900 Subject: [PATCH 16/35] 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 Signed-off-by: Takashi Iwai --- sound/firewire/Makefile | 2 +- sound/firewire/oxfw/Makefile | 2 ++ sound/firewire/{ => oxfw}/oxfw.c | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 sound/firewire/oxfw/Makefile rename sound/firewire/{ => oxfw}/oxfw.c (99%) 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 similarity index 99% rename from sound/firewire/oxfw.c rename to 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 #include #include -#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 */ -- 2.0.4