summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Romieu <romieu@fr.zoreil.com>2003-07-18 03:15:43 -0700
committerLinus Torvalds <torvalds@home.osdl.org>2003-07-18 03:15:43 -0700
commit1d02c2c0dfe098493f1359da83f1f2ba551f40a6 (patch)
tree4bd469a6191b98ea1365a575cd01dce0d0694d8f
parent4c3ff00f9017a34874636abbb1d903f037e2e1f1 (diff)
[PATCH] add new sound drivers to Makefile/Kconfig
Adds kahlua, harmony and hal2 drivers to the build options.
-rw-r--r--sound/oss/Kconfig12
-rw-r--r--sound/oss/Makefile3
2 files changed, 15 insertions, 0 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index fb2ed0ea4d3c..2fd75db6ea71 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -233,6 +233,10 @@ config SOUND_ICH
Support for integral audio in Intel's I/O Controller Hub (ICH)
chipset, as used on the 810/820/840 motherboards.
+config SOUND_HARMONY
+ tristate "PA Harmony audio driver"
+ depends on GSC_LASI && SOUND
+
config SOUND_RME96XX
tristate "RME Hammerfall (RME96XX) support (EXPERIMENTAL)"
depends on SOUND_PRIME!=n && SOUND && PCI && EXPERIMENTAL
@@ -260,6 +264,10 @@ config SOUND_VWSND
<file:Documentation/sound/oss/vwsnd> for more info on this driver's
capabilities.
+config SOUND_HAL2
+ tristate "SGI HAL2 sound (EXPERIMENTAL)"
+ depends on SGI_IP22 && SOUND && EXPERIMENTAL
+
config SOUND_VRC5477
tristate "NEC Vrc5477 AC97 sound"
depends on SOUND_PRIME!=n && DDB5477 && SOUND
@@ -1126,6 +1134,10 @@ config SOUND_TVMIXER
Support for audio mixer facilities on the BT848 TV frame-grabber
card.
+config SOUND_KAHLUA
+ tristate "XpressAudio Sound Blaster emulation"
+ depends on SOUND_SB
+
config SOUND_ALI5455
tristate "ALi5455 audio support"
depends on SOUND_PRIME!=n && PCI
diff --git a/sound/oss/Makefile b/sound/oss/Makefile
index 9527011b6e59..b6a41ba629e3 100644
--- a/sound/oss/Makefile
+++ b/sound/oss/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_SOUND_CS4232) += cs4232.o ad1848.o
# Please leave it as is, cause the link order is significant !
+obj-$(CONFIG_SOUND_HAL2) += hal2.o
obj-$(CONFIG_SOUND_AEDSP16) += aedsp16.o
obj-$(CONFIG_SOUND_PSS) += pss.o ad1848.o mpu401.o
obj-$(CONFIG_SOUND_TRIX) += trix.o ad1848.o sb_lib.o uart401.o
@@ -21,6 +22,7 @@ obj-$(CONFIG_SOUND_MSS) += ad1848.o
obj-$(CONFIG_SOUND_OPL3SA2) += opl3sa2.o ad1848.o mpu401.o
obj-$(CONFIG_SOUND_PAS) += pas2.o sb.o sb_lib.o uart401.o
obj-$(CONFIG_SOUND_SB) += sb.o sb_lib.o uart401.o
+obj-$(CONFIG_SOUND_KAHLUA) += kahlua.o
obj-$(CONFIG_SOUND_WAVEFRONT) += wavefront.o
obj-$(CONFIG_SOUND_MAUI) += maui.o mpu401.o
obj-$(CONFIG_SOUND_MPU401) += mpu401.o
@@ -60,6 +62,7 @@ obj-$(CONFIG_SOUND_FUSION) += cs46xx.o ac97_codec.o
obj-$(CONFIG_SOUND_MAESTRO) += maestro.o
obj-$(CONFIG_SOUND_MAESTRO3) += maestro3.o ac97_codec.o
obj-$(CONFIG_SOUND_TRIDENT) += trident.o ac97_codec.o
+obj-$(CONFIG_SOUND_HARMONY) += harmony.o
obj-$(CONFIG_SOUND_EMU10K1) += ac97_codec.o
obj-$(CONFIG_SOUND_RME96XX) += rme96xx.o
obj-$(CONFIG_SOUND_BT878) += btaudio.o