Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a4e39c2 authored Nov 29, 2014 by Takashi Sakamoto Committed by Takashi Iwai Nov 29, 2014

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>

parent 8832c5a7

sound/firewire/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@ snd-scs1x-objs := scs1x.o

	obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o		obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o
	obj-$(CONFIG_SND_DICE) += dice/		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_ISIGHT) += snd-isight.o
	obj-$(CONFIG_SND_SCS1X) += snd-scs1x.o		obj-$(CONFIG_SND_SCS1X) += snd-scs1x.o
	obj-$(CONFIG_SND_FIREWORKS) += fireworks/		obj-$(CONFIG_SND_FIREWORKS) += fireworks/

sound/firewire/oxfw/Makefile

0 → 100644

+2 −0

Original line number	Original line	Diff line number	Diff line
			snd-oxfw-objs := oxfw.o
			obj-m += snd-oxfw.o

sound/firewire/oxfw.c→sound/firewire/oxfw/oxfw.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -17,10 +17,10 @@
	#include <sound/initval.h>		#include <sound/initval.h>
	#include <sound/pcm.h>		#include <sound/pcm.h>
	#include <sound/pcm_params.h>		#include <sound/pcm_params.h>
	#include "cmp.h"		#include "../cmp.h"
	#include "fcp.h"		#include "../fcp.h"
	#include "amdtp.h"		#include "../amdtp.h"
	#include "lib.h"		#include "../lib.h"

	#define OXFORD_FIRMWARE_ID_ADDRESS (CSR_REGISTER_BASE + 0x50000)		#define OXFORD_FIRMWARE_ID_ADDRESS (CSR_REGISTER_BASE + 0x50000)
	/* 0x970?vvvv or 0x971?vvvv, where vvvv = firmware version */		/* 0x970?vvvv or 0x971?vvvv, where vvvv = firmware version */