* PATCH: Makefile bits for audio resync
@ 2003-07-18 14:32 Alan Cox
2003-07-18 22:12 ` [PATCH] 2.6.0-test1-after-alan-s-patch - More Makefile/Kconfig bits Francois Romieu
0 siblings, 1 reply; 3+ messages in thread
From: Alan Cox @ 2003-07-18 14:32 UTC (permalink / raw)
To: linux-kernel, torvalds
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test1/sound/oss/Kconfig linux-2.6.0-test1-ac2/sound/oss/Kconfig
--- linux-2.6.0-test1/sound/oss/Kconfig 2003-07-14 14:11:57.000000000 +0100
+++ linux-2.6.0-test1-ac2/sound/oss/Kconfig 2003-07-14 14:25:18.000000000 +0100
@@ -1126,3 +1126,19 @@
Support for audio mixer facilities on the BT848 TV frame-grabber
card.
+config SOUND_ALI5455
+ tristate "ALi5455 audio support"
+ depends on SOUND_PRIME!=n && PCI
+
+config SOUND_FORTE
+ tristate "ForteMedia FM801 driver"
+ depends on SOUND_PRIME!=n && PCI
+
+config SOUND_RME96XX
+ tristate "RME Hammerfall (RME96XX) support"
+ depends on SOUND_PRIME!=n && PCI
+
+config SOUND_AD1980
+ tristate "AD1980 front/back switch plugin"
+ depends on SOUND_PRIME!=n
+
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test1/sound/oss/Makefile linux-2.6.0-test1-ac2/sound/oss/Makefile
--- linux-2.6.0-test1/sound/oss/Makefile 2003-07-14 14:11:57.000000000 +0100
+++ linux-2.6.0-test1-ac2/sound/oss/Makefile 2003-07-14 14:25:22.000000000 +0100
@@ -63,7 +63,12 @@
obj-$(CONFIG_SOUND_EMU10K1) += ac97_codec.o
obj-$(CONFIG_SOUND_RME96XX) += rme96xx.o
obj-$(CONFIG_SOUND_BT878) += btaudio.o
+obj-$(CONFIG_SOUND_ALI5455) += ali5455.o ac97_codec.o
obj-$(CONFIG_SOUND_IT8172) += ite8172.o ac97_codec.o
+obj-$(CONFIG_SOUND_FORTE) += forte.o
+
+obj-$(CONFIG_SOUND_AD1980) += ac97_plugin_ad1980.o
+obj-$(CONFIG_SOUND_WM97XX) += ac97_plugin_wm97xx.o
ifeq ($(CONFIG_MIDI_EMU10K1),y)
obj-$(CONFIG_SOUND_EMU10K1) += sound.o
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] 2.6.0-test1-after-alan-s-patch - More Makefile/Kconfig bits
2003-07-18 14:32 PATCH: Makefile bits for audio resync Alan Cox
@ 2003-07-18 22:12 ` Francois Romieu
2003-07-18 22:20 ` Alan Cox
0 siblings, 1 reply; 3+ messages in thread
From: Francois Romieu @ 2003-07-18 22:12 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-kernel, torvalds
Adds kahlua, harmony and hal2 drivers amongst the build options.
sound/oss/Kconfig | 12 ++++++++++++
sound/oss/Makefile | 3 +++
2 files changed, 15 insertions(+)
diff -puN sound/oss/Makefile~doh-sync-oss-build sound/oss/Makefile
--- linux-2.6.0-test1-20030718_0517/sound/oss/Makefile~doh-sync-oss-build Fri Jul 18 23:43:22 2003
+++ linux-2.6.0-test1-20030718_0517-fr/sound/oss/Makefile Fri Jul 18 23:45:47 2003
@@ -10,6 +10,7 @@ obj-$(CONFIG_SOUND_CS4232) += cs4232.o a
# 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 a
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
diff -puN sound/oss/Kconfig~doh-sync-oss-build sound/oss/Kconfig
--- linux-2.6.0-test1-20030718_0517/sound/oss/Kconfig~doh-sync-oss-build Fri Jul 18 23:43:28 2003
+++ linux-2.6.0-test1-20030718_0517-fr/sound/oss/Kconfig Sat Jul 19 00:02:51 2003
@@ -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
@@ -1125,4 +1133,8 @@ config SOUND_TVMIXER
help
Support for audio mixer facilities on the BT848 TV frame-grabber
card.
+
+config SOUND_KAHLUA
+ tristate "XpressAudio Sound Blaster emulation"
+ depends on SOUND_SB
_
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] 2.6.0-test1-after-alan-s-patch - More Makefile/Kconfig bits
2003-07-18 22:12 ` [PATCH] 2.6.0-test1-after-alan-s-patch - More Makefile/Kconfig bits Francois Romieu
@ 2003-07-18 22:20 ` Alan Cox
0 siblings, 0 replies; 3+ messages in thread
From: Alan Cox @ 2003-07-18 22:20 UTC (permalink / raw)
To: Francois Romieu; +Cc: Linux Kernel Mailing List, torvalds
On Gwe, 2003-07-18 at 23:12, Francois Romieu wrote:
> Adds kahlua, harmony and hal2 drivers amongst the build options.
>
I left the harmony and hal2 out intentionally because they are tied to
MIPS and PARISC build rules that are not yet really finalised for 2.6,
but this looks fine
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-07-18 22:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-18 14:32 PATCH: Makefile bits for audio resync Alan Cox
2003-07-18 22:12 ` [PATCH] 2.6.0-test1-after-alan-s-patch - More Makefile/Kconfig bits Francois Romieu
2003-07-18 22:20 ` Alan Cox
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.