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

Commit 8832c5a7 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: speakers: Rename to oxfw and rename some members 



This commit renames 'firewire-speakers' to 'oxfw' to enhance support for
devices which based on OXFW970/971. A line for MODULE_ALIAS is added.

Additionally, to help for works in followed paches, some members
in private structure are renamed.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 60cea522

sound/firewire/Kconfig

+7 −5
Original line number Diff line number Diff line
@@ -26,15 +26,17 @@ config SND_DICE 
	  To compile this driver as a module, choose M here: the module

	  will be called snd-dice.



config SND_FIREWIRE_SPEAKERS

	tristate "FireWire speakers"

config SND_OXFW

	tristate "Oxford Semiconductor FW970/971 chipset support"

	select SND_FIREWIRE_LIB

	help

	  Say Y here to include support for the Griffin FireWave Surround

	  and the LaCie FireWire Speakers.

	  Say Y here to include support for FireWire devices based on

	  Oxford Semiconductor FW970/971 chipset.

	   * Griffin Firewave

	   * LaCie Firewire Speakers



	  To compile this driver as a module, choose M here: the module

	  will be called snd-firewire-speakers.

	  will be called snd-oxfw.



config SND_ISIGHT

	tristate "Apple iSight microphone"

sound/firewire/Makefile

+2 −2
Original line number Diff line number Diff line 
snd-firewire-lib-objs := lib.o iso-resources.o packets-buffer.o \

			 fcp.o cmp.o amdtp.o

snd-firewire-speakers-objs := speakers.o

snd-oxfw-objs := oxfw.o

snd-isight-objs := isight.o

snd-scs1x-objs := scs1x.o



obj-$(CONFIG_SND_FIREWIRE_LIB) += snd-firewire-lib.o

obj-$(CONFIG_SND_DICE) += dice/

obj-$(CONFIG_SND_FIREWIRE_SPEAKERS) += snd-firewire-speakers.o

obj-$(CONFIG_SND_OXFW) += snd-oxfw.o

obj-$(CONFIG_SND_ISIGHT) += snd-isight.o

obj-$(CONFIG_SND_SCS1X) += snd-scs1x.o

obj-$(CONFIG_SND_FIREWORKS) += fireworks/

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

+171 −170

File changed and moved.

Preview size limit exceeded, changes collapsed.