Hi David,
Today's linux-next merge of the firmware tree got a conflict in
sound/isa/Kconfig between commit f6c6383502751ceb6f2f3579ad22578ca44f91f5
("ALSA: Turtle Beach Multisound Classic/Pinnacle driver") from the sound
tree and commit f2fd247da0abaa330c39922aa1f6729eff051f73 ("ALSA:
wavefront - Always use request_firmware()") from the firmware tree.
Just overlapping addition/removal. I fixed it up (see below) and can
carry the fix as necessary.
David, is the above firmware tree commit going anywhere - it has only
been in linux-next since Jan 12, but the commit is dated Aug 28 2008 ...
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc sound/isa/Kconfig
index 3409677,7658bcd..0000000
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@@ -406,46 -401,5 +406,36 @@@ config SND_WAVEFRON
To compile this driver as a module, choose M here: the module
will be called snd-wavefront.
- config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
- bool "In-kernel firmware for Wavefront"
- depends on SND_WAVEFRONT
- default y
- help
- Say Y here to include the static firmware for FX DSP built in
- the kernel for the Wavefront driver. If you choose N here,
- you need to install the firmware files from the
- alsa-firmware package.
-
+config SND_MSND_PINNACLE
+ tristate "Turtle Beach MultiSound Pinnacle/Fiji driver"
+ depends on X86 && EXPERIMENTAL
+ select FW_LOADER
+ select SND_MPU401_UART
+ select SND_PCM
+ help
+ Say Y to include support for Turtle Beach MultiSound Pinnacle/
+ Fiji soundcards.
+
+ To compile this driver as a module, choose M here: the module
+ will be called snd-msnd-pinnacle.
+
+config SND_MSND_CLASSIC
+ tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"
+ depends on X86 && EXPERIMENTAL
+ select FW_LOADER
+ select SND_MPU401_UART
+ select SND_PCM
+ help
+ Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or
+ Monterey (not for the Pinnacle or Fiji).
+
+ See <file:Documentation/sound/oss/MultiSound> for important information
+ about this driver. Note that it has been discontinued, but the
+ Voyetra Turtle Beach knowledge base entry for it is still available
+ at <http://www.turtlebeach.com/site/kb_ftp/790.asp>.
+
+ To compile this driver as a module, choose M here: the module
+ will be called snd-msnd-classic.
+
endif # SND_ISA
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
