Commit 1d02c2c0 authored by François Romieu's avatar François Romieu Committed by Linus Torvalds

[PATCH] add new sound drivers to Makefile/Kconfig

Adds kahlua, harmony and hal2 drivers to the build options.
parent 4c3ff00f
...@@ -233,6 +233,10 @@ config SOUND_ICH ...@@ -233,6 +233,10 @@ config SOUND_ICH
Support for integral audio in Intel's I/O Controller Hub (ICH) Support for integral audio in Intel's I/O Controller Hub (ICH)
chipset, as used on the 810/820/840 motherboards. 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 config SOUND_RME96XX
tristate "RME Hammerfall (RME96XX) support (EXPERIMENTAL)" tristate "RME Hammerfall (RME96XX) support (EXPERIMENTAL)"
depends on SOUND_PRIME!=n && SOUND && PCI && EXPERIMENTAL depends on SOUND_PRIME!=n && SOUND && PCI && EXPERIMENTAL
...@@ -260,6 +264,10 @@ config SOUND_VWSND ...@@ -260,6 +264,10 @@ config SOUND_VWSND
<file:Documentation/sound/oss/vwsnd> for more info on this driver's <file:Documentation/sound/oss/vwsnd> for more info on this driver's
capabilities. capabilities.
config SOUND_HAL2
tristate "SGI HAL2 sound (EXPERIMENTAL)"
depends on SGI_IP22 && SOUND && EXPERIMENTAL
config SOUND_VRC5477 config SOUND_VRC5477
tristate "NEC Vrc5477 AC97 sound" tristate "NEC Vrc5477 AC97 sound"
depends on SOUND_PRIME!=n && DDB5477 && SOUND depends on SOUND_PRIME!=n && DDB5477 && SOUND
...@@ -1126,6 +1134,10 @@ config SOUND_TVMIXER ...@@ -1126,6 +1134,10 @@ config SOUND_TVMIXER
Support for audio mixer facilities on the BT848 TV frame-grabber Support for audio mixer facilities on the BT848 TV frame-grabber
card. card.
config SOUND_KAHLUA
tristate "XpressAudio Sound Blaster emulation"
depends on SOUND_SB
config SOUND_ALI5455 config SOUND_ALI5455
tristate "ALi5455 audio support" tristate "ALi5455 audio support"
depends on SOUND_PRIME!=n && PCI depends on SOUND_PRIME!=n && PCI
......
...@@ -10,6 +10,7 @@ obj-$(CONFIG_SOUND_CS4232) += cs4232.o ad1848.o ...@@ -10,6 +10,7 @@ obj-$(CONFIG_SOUND_CS4232) += cs4232.o ad1848.o
# Please leave it as is, cause the link order is significant ! # 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_AEDSP16) += aedsp16.o
obj-$(CONFIG_SOUND_PSS) += pss.o ad1848.o mpu401.o obj-$(CONFIG_SOUND_PSS) += pss.o ad1848.o mpu401.o
obj-$(CONFIG_SOUND_TRIX) += trix.o ad1848.o sb_lib.o uart401.o obj-$(CONFIG_SOUND_TRIX) += trix.o ad1848.o sb_lib.o uart401.o
...@@ -21,6 +22,7 @@ obj-$(CONFIG_SOUND_MSS) += ad1848.o ...@@ -21,6 +22,7 @@ obj-$(CONFIG_SOUND_MSS) += ad1848.o
obj-$(CONFIG_SOUND_OPL3SA2) += opl3sa2.o ad1848.o mpu401.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_PAS) += pas2.o sb.o sb_lib.o uart401.o
obj-$(CONFIG_SOUND_SB) += 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_WAVEFRONT) += wavefront.o
obj-$(CONFIG_SOUND_MAUI) += maui.o mpu401.o obj-$(CONFIG_SOUND_MAUI) += maui.o mpu401.o
obj-$(CONFIG_SOUND_MPU401) += mpu401.o obj-$(CONFIG_SOUND_MPU401) += mpu401.o
...@@ -60,6 +62,7 @@ obj-$(CONFIG_SOUND_FUSION) += cs46xx.o ac97_codec.o ...@@ -60,6 +62,7 @@ obj-$(CONFIG_SOUND_FUSION) += cs46xx.o ac97_codec.o
obj-$(CONFIG_SOUND_MAESTRO) += maestro.o obj-$(CONFIG_SOUND_MAESTRO) += maestro.o
obj-$(CONFIG_SOUND_MAESTRO3) += maestro3.o ac97_codec.o obj-$(CONFIG_SOUND_MAESTRO3) += maestro3.o ac97_codec.o
obj-$(CONFIG_SOUND_TRIDENT) += trident.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_EMU10K1) += ac97_codec.o
obj-$(CONFIG_SOUND_RME96XX) += rme96xx.o obj-$(CONFIG_SOUND_RME96XX) += rme96xx.o
obj-$(CONFIG_SOUND_BT878) += btaudio.o obj-$(CONFIG_SOUND_BT878) += btaudio.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment