* [PATCH] 1/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile
@ 2004-03-01 14:42 ` Russell King
2004-03-01 14:44 ` [PATCH] 2/5 " Russell King
2004-03-01 15:27 ` [PATCH] 1/5 " Takashi Iwai
0 siblings, 2 replies; 10+ messages in thread
From: Russell King @ 2004-03-01 14:42 UTC (permalink / raw)
To: Alsa Devel list, Jaroslav Kysela
This is part of a patch series to clean up sound/core/Makefile in Linux
2.6.4-rc1.
- Add SND_TIMER, SND_PCM, SND_HWDEP and SND_RAWMIDI configuration symbols.
These symbols select which modules in sound/core get built, building
snd-timer, snd-pcm, snd-hwdep and snd-rawmidi respectively.
- Add reverse dependencies ("select") to select these symbols for core
components where necessary.
- Hide SND_OSSEMUL - we can select this when SND_MIXER_OSS, SND_PCM_OSS
or SND_SEQUENCER_OSS are selected automatically.
- Tweak Makefile to use these new symbols to build these modules.
- Since we now build appropriate modules for core components according
to the new configuration symbols, (eg, snd-timer if SND_SEQUENCER is
selected) we can delete these duplications.
I'm going to explicitly mention SND_RTCTIMER here, since it appeared to
have some complex handling in the makefile. As the Kconfig definition
for this symbol stands, SND_RTCTIMER can only be selected to 'm' if
RTC is 'm' or 'y', and 'y' if RTC is 'y'. This means that the ifeq and
subst in the makefile isn't gaining us anything, so we might as well
do away with it.
--- orig/sound/core/Kconfig Sat Jun 14 22:35:04 2003
+++ linux/sound/core/Kconfig Mon Mar 1 09:37:44 2004
@@ -3,9 +3,23 @@ config SND_BIT32_EMUL
tristate "Emulation for 32-bit applications"
depends on SND && (SPARC64 || PPC64 || X86_64 && IA32_EMULATION)
+config SND_TIMER
+ tristate
+
+config SND_PCM
+ tristate
+ select SND_TIMER
+
+config SND_HWDEP
+ tristate
+
+config SND_RAWMIDI
+ tristate
+
config SND_SEQUENCER
tristate "Sequencer support"
depends on SND
+ select SND_TIMER
help
Say 'Y' or 'M' to enable MIDI sequencer and router support. This feature
allows routing and enqueing MIDI events. Events can be processed at given
@@ -20,26 +34,27 @@ config SND_SEQ_DUMMY
immediately.
config SND_OSSEMUL
- bool "OSS API emulation"
- depends on SND
- help
- Say 'Y' to enable OSS (Open Sound System) API emulation code.
+ bool
config SND_MIXER_OSS
tristate "OSS Mixer API"
- depends on SND_OSSEMUL && SND
+ depends on SND
+ select SND_OSSEMUL
help
Say 'Y' or 'M' to enable mixer OSS API emulation (/dev/mixer*).
config SND_PCM_OSS
tristate "OSS PCM (digital audio) API"
- depends on SND_OSSEMUL && SND
+ depends on SND
+ select SND_OSSEMUL
+ select SND_PCM
help
Say 'Y' or 'M' to enable digital audio (PCM) OSS API emulation (/dev/dsp*).
config SND_SEQUENCER_OSS
bool "OSS Sequencer API"
- depends on SND_OSSEMUL && SND_SEQUENCER
+ depends on SND_SEQUENCER
+ select SND_OSSEMUL
help
Say 'Y' to enable OSS sequencer emulation (both /dev/sequencer and
/dev/music interfaces).
@@ -47,6 +62,7 @@ config SND_SEQUENCER_OSS
config SND_RTCTIMER
tristate "RTC Timer support"
depends on SND && RTC
+ select SND_TIMER
help
Say 'Y' or 'M' to enable RTC timer support for ALSA. ALSA code uses RTC
timer as precise timing source and maps the RTC timer to the ALSA's timer
--- orig/sound/core/Makefile Sun Feb 29 22:53:00 2004
+++ linux/sound/core/Makefile Mon Mar 1 09:39:48 2004
@@ -26,15 +26,14 @@ ifeq ($(subst m,y,$(CONFIG_RTC)),y)
snd-hwdep-objs := hwdep.o
obj-$(CONFIG_SND) += snd.o
-ifeq ($(subst m,y,$(CONFIG_RTC)),y)
- obj-$(CONFIG_SND_RTCTIMER) += snd-timer.o
- obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o
-endif
-obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o
+obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o
+obj-$(CONFIG_SND_TIMER) += snd-timer.o
+obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o
+obj-$(CONFIG_SND_PCM) += snd-pcm.o snd-page-alloc.o
+obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o
-obj-$(CONFIG_SND_MIXER_OSS) += oss/
-obj-$(CONFIG_SND_PCM_OSS) += snd-pcm.o snd-timer.o snd-page-alloc.o oss/
-obj-$(CONFIG_SND_SEQUENCER) += snd-timer.o seq/
+obj-$(CONFIG_SND_OSSEMUL) += oss/
+obj-$(CONFIG_SND_SEQUENCER) += seq/
obj-$(CONFIG_SND_BIT32_EMUL) += ioctl32/
# Toplevel Module Dependency
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] 2/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile
2004-03-01 14:42 ` [PATCH] 1/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile Russell King
@ 2004-03-01 14:44 ` Russell King
2004-03-01 14:45 ` [PATCH] 3/5 " Russell King
2004-03-01 15:27 ` [PATCH] 1/5 " Takashi Iwai
1 sibling, 1 reply; 10+ messages in thread
From: Russell King @ 2004-03-01 14:44 UTC (permalink / raw)
To: Alsa Devel list, Jaroslav Kysela
This is part of a patch series to clean up sound/core/Makefile in Linux
2.6.4-rc1.
- Add "select SND_PCM" statements to appropriate Kconfig entries for
drivers whose configuration symbol is used to build snd-pcm,
snd-timer, and snd-page-alloc.
- Remove snd-pcm, snd-timer and snd-page-alloc from these in
sound/core/Makefile.
- Remove snd from these entries as well - all SND_xxx configuration
symbols depend on CONFIG_SND, so we won't even consider building
any of these drivers unless SND is already set to 'y' or 'm'.
--- orig/sound/arm/Kconfig Sat Nov 2 18:58:37 2002
+++ linux/sound/arm/Kconfig Mon Mar 1 13:03:57 2004
@@ -6,6 +6,7 @@ menu "ALSA ARM devices"
config SND_SA11XX_UDA1341
tristate "SA11xx UDA1341TS driver (H3600)"
depends on ARCH_SA1100 && SND && L3
+ select SND_PCM
help
Say Y or M if you have a Compaq iPaq H3x00 handheld computer and want
to use its Philips UDA 1341 audio chip.
--- orig/sound/core/Makefile Mon Mar 1 10:51:26 2004
+++ linux/sound/core/Makefile Mon Mar 1 11:11:07 2004
@@ -37,74 +37,58 @@ obj-$(CONFIG_SND_SEQUENCER) += snd-timer
obj-$(CONFIG_SND_BIT32_EMUL) += ioctl32/
# Toplevel Module Dependency
-obj-$(CONFIG_SND_DUMMY) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
obj-$(CONFIG_SND_VIRMIDI) += snd-rawmidi.o snd.o snd-timer.o
obj-$(CONFIG_SND_SERIAL_U16550) += snd-rawmidi.o snd.o snd-timer.o
obj-$(CONFIG_SND_MTPAV) += snd-rawmidi.o snd.o snd-timer.o
obj-$(CONFIG_SND_MPU401) += snd-rawmidi.o snd.o snd-timer.o
-obj-$(CONFIG_SND_ALS100) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_AZT2320) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_AZT3328) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_CMI8330) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_DT019X) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ES18XX) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_OPL3SA2) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_SGALAXY) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_AD1816A) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_AD1848) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_CS4231) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_CS4232) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_CS4236) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ES1688) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_GUSCLASSIC) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_GUSMAX) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_GUSEXTREME) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_INTERWAVE) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_INTERWAVE_STB) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_OPTI93X) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_SB8) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_SB16) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_SBAWE) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ES968) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_WAVEFRONT) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_SSCAPE) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ALS4000) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_CMIPCI) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_CS4281) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ENS1370) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_ENS1371) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_ES1938) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-hwdep.o snd-rawmidi.o
-obj-$(CONFIG_SND_ES1968) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_FM801) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ICE1712) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_ICE1724) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_INTEL8X0) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_MAESTRO3) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_RME32) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_RME96) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_SONICVIBES) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_VIA82XX) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_ALI5451) += snd.o snd-rawmidi.o snd-timer.o snd-page-alloc.o snd-pcm.o
-obj-$(CONFIG_SND_CS46XX) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_EMU10K1) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_KORG1212) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_NM256) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_RME9652) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_HDSP) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_TRIDENT) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_YMFPCI) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_POWERMAC) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
+obj-$(CONFIG_SND_ALS100) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_AZT2320) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_AZT3328) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_DT019X) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_ES18XX) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_OPL3SA2) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_AD1816A) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_CS4231) += snd-rawmidi.o
+obj-$(CONFIG_SND_CS4232) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_CS4236) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_ES1688) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_GUSCLASSIC) += snd-rawmidi.o
+obj-$(CONFIG_SND_GUSMAX) += snd-rawmidi.o
+obj-$(CONFIG_SND_GUSEXTREME) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_INTERWAVE) += snd-rawmidi.o
+obj-$(CONFIG_SND_INTERWAVE_STB) += snd-rawmidi.o
+obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_OPTI93X) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_SB8) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_SB16) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_SBAWE) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_ES968) += snd-rawmidi.o
+obj-$(CONFIG_SND_WAVEFRONT) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_SSCAPE) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_ALS4000) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_CMIPCI) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_CS4281) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_ENS1370) += snd-rawmidi.o
+obj-$(CONFIG_SND_ENS1371) += snd-rawmidi.o
+obj-$(CONFIG_SND_ES1938) += snd-hwdep.o snd-rawmidi.o
+obj-$(CONFIG_SND_ES1968) += snd-rawmidi.o
+obj-$(CONFIG_SND_FM801) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_ICE1712) += snd-rawmidi.o
+obj-$(CONFIG_SND_ICE1724) += snd-rawmidi.o
+obj-$(CONFIG_SND_INTEL8X0) += snd-rawmidi.o
+obj-$(CONFIG_SND_SONICVIBES) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_VIA82XX) += snd-rawmidi.o
+obj-$(CONFIG_SND_ALI5451) += snd-rawmidi.o
+obj-$(CONFIG_SND_CS46XX) += snd-rawmidi.o
+obj-$(CONFIG_SND_EMU10K1) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_HDSP) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_TRIDENT) += snd-rawmidi.o
+obj-$(CONFIG_SND_YMFPCI) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_PC98_CS4232) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_USB_AUDIO) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o
-obj-$(CONFIG_SND_SUN_AMD7930) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_SUN_CS4231) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_HARMONY) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
-obj-$(CONFIG_SND_VXPOCKET) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-hwdep.o
-obj-$(CONFIG_SND_VXP440) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-hwdep.o
-obj-$(CONFIG_SND_VX222) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-hwdep.o
-obj-$(CONFIG_SND_BT87X) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
+obj-$(CONFIG_SND_PC98_CS4232) += snd-rawmidi.o snd-hwdep.o
+obj-$(CONFIG_SND_USB_AUDIO) += snd-rawmidi.o
+obj-$(CONFIG_SND_VXPOCKET) += snd-hwdep.o
+obj-$(CONFIG_SND_VXP440) += snd-hwdep.o
+obj-$(CONFIG_SND_VX222) += snd-hwdep.o
obj-m := $(sort $(obj-m))
--- orig/sound/drivers/Kconfig Sat Nov 2 18:58:37 2002
+++ linux/sound/drivers/Kconfig Mon Mar 1 10:52:04 2004
@@ -6,6 +6,7 @@ menu "Generic devices"
config SND_DUMMY
tristate "Dummy (/dev/null) soundcard"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include dummy driver. This driver does nothing, but
emulates various mixer controls and PCM devices.
--- orig/sound/isa/Kconfig Sat Jun 14 22:35:08 2003
+++ linux/sound/isa/Kconfig Mon Mar 1 10:56:02 2004
@@ -6,6 +6,7 @@ menu "ISA devices"
config SND_AD1816A
tristate "Analog Devices SoundPort AD1816A"
depends on SND && ISAPNP
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Analog Devices SoundPort AD1816A or
compatible sound chips.
@@ -13,6 +14,7 @@ config SND_AD1816A
config SND_AD1848
tristate "Generic AD1848/CS4248 driver"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for AD1848 (Analog Devices) or CS4248
(Cirrus Logic - Crystal Semiconductors) chips. Please, for newer chips
@@ -21,6 +23,7 @@ config SND_AD1848
config SND_CS4231
tristate "Generic Cirrus Logic CS4231 driver"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for CS4231 chips from Cirrus Logic -
Crystal Semiconductors.
@@ -28,6 +31,7 @@ config SND_CS4231
config SND_CS4232
tristate "Generic Cirrus Logic CS4232 driver"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for CS4232 chips from Cirrus Logic -
Crystal Semiconductors.
@@ -35,6 +39,7 @@ config SND_CS4232
config SND_CS4236
tristate "Generic Cirrus Logic CS4236+ driver"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for CS4235,CS4236,CS4237B,CS4238B,CS4239
chips from Cirrus Logic - Crystal Semiconductors.
@@ -42,6 +47,7 @@ config SND_CS4236
config SND_PC98_CS4232
tristate "NEC PC9800 CS4232 driver"
depends on SND && X86_PC9800
+ select SND_PCM
help
Say 'Y' or 'M' to include support for NEC PC-9801/PC-9821 on-board
soundchip based on CS4232.
@@ -49,42 +55,49 @@ config SND_PC98_CS4232
config SND_ES968
tristate "Generic ESS ES968 driver"
depends on SND && ISAPNP
+ select SND_PCM
help
Say 'Y' or 'M' to include support for ESS AudioDrive ES968 chip.
config SND_ES1688
tristate "Generic ESS ES688/ES1688 driver"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for ESS AudioDrive ES688 or ES1688 chips.
config SND_ES18XX
tristate "Generic ESS ES18xx driver"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for ESS AudioDrive ES18xx chips.
config SND_GUSCLASSIC
tristate "Gravis UltraSound Classic"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Gravis UltraSound Classic soundcard.
config SND_GUSEXTREME
tristate "Gravis UltraSound Extreme"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Gravis UltraSound Extreme soundcard.
config SND_GUSMAX
tristate "Gravis UltraSound MAX"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Gravis UltraSound MAX soundcard.
config SND_INTERWAVE
tristate "AMD InterWave, Gravis UltraSound PnP"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for AMD InterWave based soundcards
(Gravis UltraSound Plug & Play, STB SoundRage32, MED3210, Dynasonic Pro,
@@ -93,6 +106,7 @@ config SND_INTERWAVE
config SND_INTERWAVE_STB
tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for AMD InterWave based soundcards
with TEA6330T bass and treble regulator (UltraSound 32-Pro).
@@ -100,6 +114,7 @@ config SND_INTERWAVE_STB
config SND_OPTI92X_AD1848
tristate "OPTi 82C92x - AD1848"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Opti92x soundcards equiped with
AD1848 codec.
@@ -107,6 +122,7 @@ config SND_OPTI92X_AD1848
config SND_OPTI92X_CS4231
tristate "OPTi 82C92x - CS4231"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Opti92x soundcards equiped with
CS4231 codec.
@@ -114,12 +130,14 @@ config SND_OPTI92X_CS4231
config SND_OPTI93X
tristate "OPTi 82C93x"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Opti93x soundcards.
config SND_SB8
tristate "Sound Blaster 1.0/2.0/Pro (8-bit)"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Sound Blaster 1.0/2.0/Pro (8-bit)
soundcards or 100% compatible from Creative.
@@ -127,6 +145,7 @@ config SND_SB8
config SND_SB16
tristate "Sound Blaster 16 (PnP)"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Sound Blaster 16 (including
Plug and Play version).
@@ -134,6 +153,7 @@ config SND_SB16
config SND_SBAWE
tristate "Sound Blaster AWE (32,64) (PnP)"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Sound Blaster AWE (including
Plug and Play version).
@@ -149,6 +169,7 @@ config SND_SB16_CSP
config SND_WAVEFRONT
tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Turtle Beach Maui, Tropez
and Tropez+ soundcards based on Wavefront chip.
@@ -156,6 +177,7 @@ config SND_WAVEFRONT
config SND_ALS100
tristate "Avance Logic ALS100/ALS120"
depends on SND && ISAPNP
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Avance Logic ALS100, ALS110,
ALS120 and ALS200 soundcards.
@@ -163,18 +185,21 @@ config SND_ALS100
config SND_AZT2320
tristate "Aztech Systems AZT2320"
depends on SND && ISAPNP
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Aztech Systems AZT2320 soundcard.
config SND_CMI8330
tristate "C-Media CMI8330"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for C-Media CMI8330 based soundcards.
config SND_DT019X
tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
depends on SND && ISAPNP
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Diamond Technologies DT-019X and
Avance Logic ALS-007 soundcards.
@@ -182,18 +207,21 @@ config SND_DT019X
config SND_OPL3SA2
tristate "Yamaha OPL3-SA2/SA3"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Yamaha OPL3SA2 or OPL3SA3 chips.
config SND_SGALAXY
tristate "Aztech Sound Galaxy"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Aztech Sound Galaxy.
config SND_SSCAPE
tristate "Ensoniq SoundScape PnP driver"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Ensoniq SoundScape PnP
soundcard.
--- orig/sound/pci/Kconfig Wed Feb 18 22:35:55 2004
+++ linux/sound/pci/Kconfig Mon Mar 1 11:03:28 2004
@@ -6,18 +6,21 @@ menu "PCI devices"
config SND_ALI5451
tristate "ALi PCI Audio M5451"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for ALI PCI Audio M5451 sound core.
config SND_AZT3328
tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)"
depends on SND && EXPERIMENTAL
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Aztech AZF3328 (PCI168) soundcards.
config SND_BT87X
tristate "Bt87x Audio Capture"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for recording audio from TV cards
based on Brooktree Bt878/Bt879 chips.
@@ -25,6 +28,7 @@ config SND_BT87X
config SND_CS46XX
tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"
depends on SND
+ select SND_PCM
select GAMEPORT
help
Say 'Y' or 'M' to include support for Cirrus Logic CS4610 / CS4612 /
@@ -39,12 +43,14 @@ config SND_CS46XX_NEW_DSP
config SND_CS4281
tristate "Cirrus Logic (Sound Fusion) CS4281"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Cirrus Logic CS4281.
config SND_EMU10K1
tristate "EMU10K1 (SB Live! & Audigy, E-mu APS)"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Sound Blaster PCI 512, Live!,
Audigy and E-mu APS (partially supported).
@@ -52,18 +58,21 @@ config SND_EMU10K1
config SND_KORG1212
tristate "Korg 1212 IO"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Korg 1212IO.
config SND_NM256
tristate "NeoMagic NM256AV/ZX"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for NeoMagic NM256AV/ZX chips.
config SND_RME32
tristate "RME Digi32, 32/8, 32 PRO"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for RME Digi32, Digi32 PRO and
Digi32/8 (Sek'd Prodif32, Prodif96 and Prodif Gold) audio devices.
@@ -71,6 +80,7 @@ config SND_RME32
config SND_RME96
tristate "RME Digi96, 96/8, 96/8 PRO"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for RME Digi96, Digi96/8 and
Digi96/8 PRO/PAD/PST.
@@ -78,6 +88,7 @@ config SND_RME96
config SND_RME9652
tristate "RME Digi9652 (Hammerfall)"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for RME Hammerfall (RME Digi9652 /
Digi9636) soundcards.
@@ -85,6 +96,7 @@ config SND_RME9652
config SND_HDSP
tristate "RME Hammerfall DSP Audio"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for RME Hammerfall DSP Audio
soundcards.
@@ -92,6 +104,7 @@ config SND_HDSP
config SND_TRIDENT
tristate "Trident 4D-Wave DX/NX; SiS 7018"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Trident 4D-Wave DX/NX and
SiS 7018 soundcards.
@@ -99,6 +112,7 @@ config SND_TRIDENT
config SND_YMFPCI
tristate "Yamaha YMF724/740/744/754"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Yamaha PCI audio chips -
YMF724, YMF724F, YMF740, YMF740C, YMF744, YMF754.
@@ -106,12 +120,14 @@ config SND_YMFPCI
config SND_ALS4000
tristate "Avance Logic ALS4000"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Avance Logic ALS4000.
config SND_CMIPCI
tristate "C-Media 8738, 8338"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for C-Media CMI8338 and 8738 PCI
soundcards.
@@ -119,12 +135,14 @@ config SND_CMIPCI
config SND_ENS1370
tristate "(Creative) Ensoniq AudioPCI 1370"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Ensoniq AudioPCI ES1370.
config SND_ENS1371
tristate "(Creative) Ensoniq AudioPCI 1371/1373"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Ensoniq AudioPCI ES1371 and
Sound Blaster PCI 64 or 128 soundcards.
@@ -132,6 +150,7 @@ config SND_ENS1371
config SND_ES1938
tristate "ESS ES1938/1946/1969 (Solo-1)"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for ESS Solo-1 (ES1938, ES1946, ES1969)
soundcard.
@@ -139,18 +158,21 @@ config SND_ES1938
config SND_ES1968
tristate "ESS ES1968/1978 (Maestro-1/2/2E)"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for ESS Maestro 1/2/2E.
config SND_MAESTRO3
tristate "ESS Allegro/Maestro3"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for ESS Maestro 3 (Allegro) soundcard.
config SND_FM801
tristate "ForteMedia FM801"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for ForteMedia FM801 based soundcards.
@@ -164,6 +186,7 @@ config CONFIG_SND_FM801_TEA575X
config SND_ICE1712
tristate "ICEnsemble ICE1712 (Envy24)"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for ICE1712 (Envy24) based soundcards.
Currently supported hardware is: MidiMan M Audio - Delta 1010(LT), Dio 2496,
@@ -173,6 +196,7 @@ config SND_ICE1712
config SND_ICE1724
tristate "ICE/VT1724 (Envy24HT)"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for ICE/VT1724 (Envy24HT) based
soundcards.
@@ -182,6 +206,7 @@ config SND_ICE1724
config SND_INTEL8X0
tristate "Intel i8x0/MX440, SiS 7012; Ali 5455; NForce Audio; AMD768/8111"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Intel8x0 based soundcards,
SiS 7012, AMD768/8111, NVidia NForce and ALi 5455 chips.
@@ -189,18 +214,21 @@ config SND_INTEL8X0
config SND_SONICVIBES
tristate "S3 SonicVibes"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for S3 SonicVibes based soundcards.
config SND_VIA82XX
tristate "VIA 82C686A/B, 8233 South Bridge"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for VIA VT82C686A/B, VT8233 South Bridge.
config SND_VX222
tristate "Digigram VX222"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Digigram VX222 soundcards.
--- orig/sound/ppc/Kconfig Sat Nov 2 18:58:41 2002
+++ linux/sound/ppc/Kconfig Mon Mar 1 11:10:19 2004
@@ -6,6 +6,7 @@ menu "ALSA PowerMac devices"
config SND_POWERMAC
tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
depends on SND
+ select SND_PCM
endmenu
--- orig/sound/parisc/Kconfig Sat Jun 14 22:35:12 2003
+++ linux/sound/parisc/Kconfig Mon Mar 1 11:11:03 2004
@@ -6,6 +6,7 @@ menu "ALSA PA-RISC devices"
config SND_HARMONY
tristate "Harmony/Vivace sound chip"
depends on SND
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Harmony/Vivace soundchip
on HP712s, 715/new and many other GSC based machines.
--- orig/sound/sparc/Kconfig Sat Nov 2 18:58:41 2002
+++ linux/sound/sparc/Kconfig Mon Mar 1 11:10:48 2004
@@ -6,11 +6,13 @@ menu "ALSA Sparc devices"
config SND_SUN_AMD7930
tristate "Sun AMD7930"
depends on SBUS && SND
+ select SND_PCM
# dep_tristate 'Sun DBRI' CONFIG_SND_SUN_DBRI $CONFIG_SND
config SND_SUN_CS4231
tristate "Sun CS4231"
depends on SND
+ select SND_PCM
endmenu
--- orig/sound/usb/Kconfig Sat Dec 28 17:08:02 2002
+++ linux/sound/usb/Kconfig Mon Mar 1 11:05:38 2004
@@ -6,6 +6,7 @@ menu "ALSA USB devices"
config SND_USB_AUDIO
tristate "USB Audio/MIDI driver"
depends on SND && USB
+ select SND_PCM
help
Say 'Y' or 'M' to include support for USB audio and USB MIDI devices.
--- orig/sound/pcmcia/Kconfig Wed Feb 18 22:36:01 2004
+++ linux/sound/pcmcia/Kconfig Mon Mar 1 11:05:15 2004
@@ -6,12 +6,14 @@ menu "PCMCIA devices"
config SND_VXPOCKET
tristate "Digigram VXpocket"
depends on SND && PCMCIA && ISA
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Digigram VXpocket soundcard.
config SND_VXP440
tristate "Digigram VXpocket 440"
depends on SND && PCMCIA && ISA
+ select SND_PCM
help
Say 'Y' or 'M' to include support for Digigram VXpocket 440 soundcard.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] 3/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile
2004-03-01 14:44 ` [PATCH] 2/5 " Russell King
@ 2004-03-01 14:45 ` Russell King
2004-03-01 14:45 ` [PATCH] 4/5 " Russell King
0 siblings, 1 reply; 10+ messages in thread
From: Russell King @ 2004-03-01 14:45 UTC (permalink / raw)
To: Alsa Devel list, Jaroslav Kysela
This is part of a patch series to clean up sound/core/Makefile in Linux
2.6.4-rc1.
- Add SND_RAWMIDI for drivers which use the snd-rawmidi module.
- Remove snd-rawmidi from these drivers entries in sound/core/Makefile
- Remove any sound/core/Makefile entries which are left empty.
--- orig/sound/core/Makefile Mon Mar 1 11:16:43 2004
+++ linux/sound/core/Makefile Mon Mar 1 11:30:43 2004
@@ -37,56 +37,39 @@ obj-$(CONFIG_SND_SEQUENCER) += snd-timer
obj-$(CONFIG_SND_BIT32_EMUL) += ioctl32/
# Toplevel Module Dependency
-obj-$(CONFIG_SND_VIRMIDI) += snd-rawmidi.o snd.o snd-timer.o
-obj-$(CONFIG_SND_SERIAL_U16550) += snd-rawmidi.o snd.o snd-timer.o
-obj-$(CONFIG_SND_MTPAV) += snd-rawmidi.o snd.o snd-timer.o
-obj-$(CONFIG_SND_MPU401) += snd-rawmidi.o snd.o snd-timer.o
-obj-$(CONFIG_SND_ALS100) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_AZT2320) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_AZT3328) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_DT019X) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ES18XX) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_OPL3SA2) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_AD1816A) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_CS4231) += snd-rawmidi.o
-obj-$(CONFIG_SND_CS4232) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_CS4236) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ES1688) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_GUSCLASSIC) += snd-rawmidi.o
-obj-$(CONFIG_SND_GUSMAX) += snd-rawmidi.o
-obj-$(CONFIG_SND_GUSEXTREME) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_INTERWAVE) += snd-rawmidi.o
-obj-$(CONFIG_SND_INTERWAVE_STB) += snd-rawmidi.o
-obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_OPTI93X) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_SB8) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_SB16) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_SBAWE) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ES968) += snd-rawmidi.o
-obj-$(CONFIG_SND_WAVEFRONT) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_SSCAPE) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ALS4000) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_CMIPCI) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_CS4281) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ENS1370) += snd-rawmidi.o
-obj-$(CONFIG_SND_ENS1371) += snd-rawmidi.o
-obj-$(CONFIG_SND_ES1938) += snd-hwdep.o snd-rawmidi.o
-obj-$(CONFIG_SND_ES1968) += snd-rawmidi.o
-obj-$(CONFIG_SND_FM801) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_ICE1712) += snd-rawmidi.o
-obj-$(CONFIG_SND_ICE1724) += snd-rawmidi.o
-obj-$(CONFIG_SND_INTEL8X0) += snd-rawmidi.o
-obj-$(CONFIG_SND_SONICVIBES) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_VIA82XX) += snd-rawmidi.o
-obj-$(CONFIG_SND_ALI5451) += snd-rawmidi.o
-obj-$(CONFIG_SND_CS46XX) += snd-rawmidi.o
-obj-$(CONFIG_SND_EMU10K1) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_HDSP) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_TRIDENT) += snd-rawmidi.o
-obj-$(CONFIG_SND_YMFPCI) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_PC98_CS4232) += snd-rawmidi.o snd-hwdep.o
-obj-$(CONFIG_SND_USB_AUDIO) += snd-rawmidi.o
+obj-$(CONFIG_SND_VIRMIDI) += snd-timer.o
+obj-$(CONFIG_SND_SERIAL_U16550) += snd-timer.o
+obj-$(CONFIG_SND_MTPAV) += snd-timer.o
+obj-$(CONFIG_SND_MPU401) += snd-timer.o
+obj-$(CONFIG_SND_ALS100) += snd-hwdep.o
+obj-$(CONFIG_SND_AZT2320) += snd-hwdep.o
+obj-$(CONFIG_SND_AZT3328) += snd-hwdep.o
+obj-$(CONFIG_SND_DT019X) += snd-hwdep.o
+obj-$(CONFIG_SND_ES18XX) += snd-hwdep.o
+obj-$(CONFIG_SND_OPL3SA2) += snd-hwdep.o
+obj-$(CONFIG_SND_AD1816A) += snd-hwdep.o
+obj-$(CONFIG_SND_CS4232) += snd-hwdep.o
+obj-$(CONFIG_SND_CS4236) += snd-hwdep.o
+obj-$(CONFIG_SND_ES1688) += snd-hwdep.o
+obj-$(CONFIG_SND_GUSEXTREME) += snd-hwdep.o
+obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-hwdep.o
+obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-hwdep.o
+obj-$(CONFIG_SND_OPTI93X) += snd-hwdep.o
+obj-$(CONFIG_SND_SB8) += snd-hwdep.o
+obj-$(CONFIG_SND_SB16) += snd-hwdep.o
+obj-$(CONFIG_SND_SBAWE) += snd-hwdep.o
+obj-$(CONFIG_SND_WAVEFRONT) += snd-hwdep.o
+obj-$(CONFIG_SND_SSCAPE) += snd-hwdep.o
+obj-$(CONFIG_SND_ALS4000) += snd-hwdep.o
+obj-$(CONFIG_SND_CMIPCI) += snd-hwdep.o
+obj-$(CONFIG_SND_CS4281) += snd-hwdep.o
+obj-$(CONFIG_SND_ES1938) += snd-hwdep.o
+obj-$(CONFIG_SND_FM801) += snd-hwdep.o
+obj-$(CONFIG_SND_SONICVIBES) += snd-hwdep.o
+obj-$(CONFIG_SND_EMU10K1) += snd-hwdep.o
+obj-$(CONFIG_SND_HDSP) += snd-hwdep.o
+obj-$(CONFIG_SND_YMFPCI) += snd-hwdep.o
+obj-$(CONFIG_SND_PC98_CS4232) += snd-hwdep.o
obj-$(CONFIG_SND_VXPOCKET) += snd-hwdep.o
obj-$(CONFIG_SND_VXP440) += snd-hwdep.o
obj-$(CONFIG_SND_VX222) += snd-hwdep.o
--- orig/sound/drivers/Kconfig Mon Mar 1 11:16:44 2004
+++ linux/sound/drivers/Kconfig Mon Mar 1 11:29:32 2004
@@ -15,6 +15,7 @@ config SND_DUMMY
config SND_VIRMIDI
tristate "Virtual MIDI soundcard"
depends on SND_SEQUENCER
+ select SND_RAWMIDI
help
Say 'Y' or 'M' to include virtual MIDI driver. This driver allows to
connect applications using raw MIDI devices to sequencer.
@@ -22,6 +23,7 @@ config SND_VIRMIDI
config SND_MTPAV
tristate "MOTU MidiTimePiece AV multiport MIDI"
depends on SND
+ select SND_RAWMIDI
help
Say 'Y' or 'M' to include support for MOTU MidiTimePiece AV multiport
MIDI adapter.
@@ -29,6 +31,7 @@ config SND_MTPAV
config SND_SERIAL_U16550
tristate "UART16550 - MIDI only driver"
depends on SND
+ select SND_RAWMIDI
help
Say 'Y' or 'M' to include support for MIDI serial port driver. It works
with serial UARTs 16550 and better.
@@ -36,6 +39,7 @@ config SND_SERIAL_U16550
config SND_MPU401
tristate "Generic MPU-401 UART driver"
depends on SND
+ select SND_RAWMIDI
help
Say 'Y' or 'M' to include support for MPU401 hardware using UART access.
--- orig/sound/isa/Kconfig Mon Mar 1 11:16:44 2004
+++ linux/sound/isa/Kconfig Mon Mar 1 11:22:41 2004
@@ -6,6 +6,7 @@ menu "ISA devices"
config SND_AD1816A
tristate "Analog Devices SoundPort AD1816A"
depends on SND && ISAPNP
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Analog Devices SoundPort AD1816A or
@@ -23,6 +24,7 @@ config SND_AD1848
config SND_CS4231
tristate "Generic Cirrus Logic CS4231 driver"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for CS4231 chips from Cirrus Logic -
@@ -31,6 +33,7 @@ config SND_CS4231
config SND_CS4232
tristate "Generic Cirrus Logic CS4232 driver"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for CS4232 chips from Cirrus Logic -
@@ -39,6 +42,7 @@ config SND_CS4232
config SND_CS4236
tristate "Generic Cirrus Logic CS4236+ driver"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for CS4235,CS4236,CS4237B,CS4238B,CS4239
@@ -47,6 +51,7 @@ config SND_CS4236
config SND_PC98_CS4232
tristate "NEC PC9800 CS4232 driver"
depends on SND && X86_PC9800
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for NEC PC-9801/PC-9821 on-board
@@ -55,6 +60,7 @@ config SND_PC98_CS4232
config SND_ES968
tristate "Generic ESS ES968 driver"
depends on SND && ISAPNP
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for ESS AudioDrive ES968 chip.
@@ -62,6 +68,7 @@ config SND_ES968
config SND_ES1688
tristate "Generic ESS ES688/ES1688 driver"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for ESS AudioDrive ES688 or ES1688 chips.
@@ -69,6 +76,7 @@ config SND_ES1688
config SND_ES18XX
tristate "Generic ESS ES18xx driver"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for ESS AudioDrive ES18xx chips.
@@ -76,6 +84,7 @@ config SND_ES18XX
config SND_GUSCLASSIC
tristate "Gravis UltraSound Classic"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Gravis UltraSound Classic soundcard.
@@ -83,6 +92,7 @@ config SND_GUSCLASSIC
config SND_GUSEXTREME
tristate "Gravis UltraSound Extreme"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Gravis UltraSound Extreme soundcard.
@@ -90,6 +100,7 @@ config SND_GUSEXTREME
config SND_GUSMAX
tristate "Gravis UltraSound MAX"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Gravis UltraSound MAX soundcard.
@@ -97,6 +108,7 @@ config SND_GUSMAX
config SND_INTERWAVE
tristate "AMD InterWave, Gravis UltraSound PnP"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for AMD InterWave based soundcards
@@ -106,6 +118,7 @@ config SND_INTERWAVE
config SND_INTERWAVE_STB
tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for AMD InterWave based soundcards
@@ -114,6 +127,7 @@ config SND_INTERWAVE_STB
config SND_OPTI92X_AD1848
tristate "OPTi 82C92x - AD1848"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Opti92x soundcards equiped with
@@ -122,6 +136,7 @@ config SND_OPTI92X_AD1848
config SND_OPTI92X_CS4231
tristate "OPTi 82C92x - CS4231"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Opti92x soundcards equiped with
@@ -130,6 +145,7 @@ config SND_OPTI92X_CS4231
config SND_OPTI93X
tristate "OPTi 82C93x"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Opti93x soundcards.
@@ -137,6 +153,7 @@ config SND_OPTI93X
config SND_SB8
tristate "Sound Blaster 1.0/2.0/Pro (8-bit)"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Sound Blaster 1.0/2.0/Pro (8-bit)
@@ -145,6 +162,7 @@ config SND_SB8
config SND_SB16
tristate "Sound Blaster 16 (PnP)"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Sound Blaster 16 (including
@@ -153,6 +171,7 @@ config SND_SB16
config SND_SBAWE
tristate "Sound Blaster AWE (32,64) (PnP)"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Sound Blaster AWE (including
@@ -169,6 +188,7 @@ config SND_SB16_CSP
config SND_WAVEFRONT
tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Turtle Beach Maui, Tropez
@@ -177,6 +197,7 @@ config SND_WAVEFRONT
config SND_ALS100
tristate "Avance Logic ALS100/ALS120"
depends on SND && ISAPNP
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Avance Logic ALS100, ALS110,
@@ -185,6 +206,7 @@ config SND_ALS100
config SND_AZT2320
tristate "Aztech Systems AZT2320"
depends on SND && ISAPNP
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Aztech Systems AZT2320 soundcard.
@@ -199,6 +221,7 @@ config SND_CMI8330
config SND_DT019X
tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
depends on SND && ISAPNP
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Diamond Technologies DT-019X and
@@ -207,6 +230,7 @@ config SND_DT019X
config SND_OPL3SA2
tristate "Yamaha OPL3-SA2/SA3"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Yamaha OPL3SA2 or OPL3SA3 chips.
@@ -221,6 +245,7 @@ config SND_SGALAXY
config SND_SSCAPE
tristate "Ensoniq SoundScape PnP driver"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Ensoniq SoundScape PnP
--- orig/sound/pci/Kconfig Mon Mar 1 11:16:44 2004
+++ linux/sound/pci/Kconfig Mon Mar 1 11:27:54 2004
@@ -6,6 +6,7 @@ menu "PCI devices"
config SND_ALI5451
tristate "ALi PCI Audio M5451"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for ALI PCI Audio M5451 sound core.
@@ -13,6 +14,7 @@ config SND_ALI5451
config SND_AZT3328
tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)"
depends on SND && EXPERIMENTAL
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Aztech AZF3328 (PCI168) soundcards.
@@ -28,6 +30,7 @@ config SND_BT87X
config SND_CS46XX
tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
select GAMEPORT
help
@@ -43,6 +46,7 @@ config SND_CS46XX_NEW_DSP
config SND_CS4281
tristate "Cirrus Logic (Sound Fusion) CS4281"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Cirrus Logic CS4281.
@@ -50,6 +54,7 @@ config SND_CS4281
config SND_EMU10K1
tristate "EMU10K1 (SB Live! & Audigy, E-mu APS)"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Sound Blaster PCI 512, Live!,
@@ -96,6 +101,7 @@ config SND_RME9652
config SND_HDSP
tristate "RME Hammerfall DSP Audio"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for RME Hammerfall DSP Audio
@@ -104,6 +110,7 @@ config SND_HDSP
config SND_TRIDENT
tristate "Trident 4D-Wave DX/NX; SiS 7018"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Trident 4D-Wave DX/NX and
@@ -112,6 +119,7 @@ config SND_TRIDENT
config SND_YMFPCI
tristate "Yamaha YMF724/740/744/754"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Yamaha PCI audio chips -
@@ -120,6 +128,7 @@ config SND_YMFPCI
config SND_ALS4000
tristate "Avance Logic ALS4000"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Avance Logic ALS4000.
@@ -127,6 +136,7 @@ config SND_ALS4000
config SND_CMIPCI
tristate "C-Media 8738, 8338"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for C-Media CMI8338 and 8738 PCI
@@ -135,6 +145,7 @@ config SND_CMIPCI
config SND_ENS1370
tristate "(Creative) Ensoniq AudioPCI 1370"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Ensoniq AudioPCI ES1370.
@@ -142,6 +153,7 @@ config SND_ENS1370
config SND_ENS1371
tristate "(Creative) Ensoniq AudioPCI 1371/1373"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Ensoniq AudioPCI ES1371 and
@@ -150,6 +162,7 @@ config SND_ENS1371
config SND_ES1938
tristate "ESS ES1938/1946/1969 (Solo-1)"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for ESS Solo-1 (ES1938, ES1946, ES1969)
@@ -158,6 +171,7 @@ config SND_ES1938
config SND_ES1968
tristate "ESS ES1968/1978 (Maestro-1/2/2E)"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for ESS Maestro 1/2/2E.
@@ -172,6 +186,7 @@ config SND_MAESTRO3
config SND_FM801
tristate "ForteMedia FM801"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for ForteMedia FM801 based soundcards.
@@ -186,6 +201,7 @@ config CONFIG_SND_FM801_TEA575X
config SND_ICE1712
tristate "ICEnsemble ICE1712 (Envy24)"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for ICE1712 (Envy24) based soundcards.
@@ -196,6 +212,7 @@ config SND_ICE1712
config SND_ICE1724
tristate "ICE/VT1724 (Envy24HT)"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for ICE/VT1724 (Envy24HT) based
@@ -206,6 +223,7 @@ config SND_ICE1724
config SND_INTEL8X0
tristate "Intel i8x0/MX440, SiS 7012; Ali 5455; NForce Audio; AMD768/8111"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for Intel8x0 based soundcards,
@@ -214,6 +232,7 @@ config SND_INTEL8X0
config SND_SONICVIBES
tristate "S3 SonicVibes"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for S3 SonicVibes based soundcards.
@@ -221,6 +240,7 @@ config SND_SONICVIBES
config SND_VIA82XX
tristate "VIA 82C686A/B, 8233 South Bridge"
depends on SND
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for VIA VT82C686A/B, VT8233 South Bridge.
--- orig/sound/usb/Kconfig Mon Mar 1 11:16:45 2004
+++ linux/sound/usb/Kconfig Mon Mar 1 11:28:18 2004
@@ -6,6 +6,7 @@ menu "ALSA USB devices"
config SND_USB_AUDIO
tristate "USB Audio/MIDI driver"
depends on SND && USB
+ select SND_RAWMIDI
select SND_PCM
help
Say 'Y' or 'M' to include support for USB audio and USB MIDI devices.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] 4/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile
2004-03-01 14:45 ` [PATCH] 3/5 " Russell King
@ 2004-03-01 14:45 ` Russell King
2004-03-01 14:46 ` [PATCH] 5/5 " Russell King
0 siblings, 1 reply; 10+ messages in thread
From: Russell King @ 2004-03-01 14:45 UTC (permalink / raw)
To: Alsa Devel list, Jaroslav Kysela
This is part of a patch series to clean up sound/core/Makefile in Linux
2.6.4-rc1.
- Add SND_HWDEP for drivers which use the snd-hwdep module.
- Remove snd-hwdep from these drivers entries in sound/core/Makefile,
removing any sound/core/Makefile entries which are left empty.
--- orig/sound/core/Makefile Mon Mar 1 11:37:21 2004
+++ linux/sound/core/Makefile Mon Mar 1 11:46:31 2004
@@ -41,37 +41,5 @@ obj-$(CONFIG_SND_VIRMIDI) += snd-timer.o
obj-$(CONFIG_SND_SERIAL_U16550) += snd-timer.o
obj-$(CONFIG_SND_MTPAV) += snd-timer.o
obj-$(CONFIG_SND_MPU401) += snd-timer.o
-obj-$(CONFIG_SND_ALS100) += snd-hwdep.o
-obj-$(CONFIG_SND_AZT2320) += snd-hwdep.o
-obj-$(CONFIG_SND_AZT3328) += snd-hwdep.o
-obj-$(CONFIG_SND_DT019X) += snd-hwdep.o
-obj-$(CONFIG_SND_ES18XX) += snd-hwdep.o
-obj-$(CONFIG_SND_OPL3SA2) += snd-hwdep.o
-obj-$(CONFIG_SND_AD1816A) += snd-hwdep.o
-obj-$(CONFIG_SND_CS4232) += snd-hwdep.o
-obj-$(CONFIG_SND_CS4236) += snd-hwdep.o
-obj-$(CONFIG_SND_ES1688) += snd-hwdep.o
-obj-$(CONFIG_SND_GUSEXTREME) += snd-hwdep.o
-obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-hwdep.o
-obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-hwdep.o
-obj-$(CONFIG_SND_OPTI93X) += snd-hwdep.o
-obj-$(CONFIG_SND_SB8) += snd-hwdep.o
-obj-$(CONFIG_SND_SB16) += snd-hwdep.o
-obj-$(CONFIG_SND_SBAWE) += snd-hwdep.o
-obj-$(CONFIG_SND_WAVEFRONT) += snd-hwdep.o
-obj-$(CONFIG_SND_SSCAPE) += snd-hwdep.o
-obj-$(CONFIG_SND_ALS4000) += snd-hwdep.o
-obj-$(CONFIG_SND_CMIPCI) += snd-hwdep.o
-obj-$(CONFIG_SND_CS4281) += snd-hwdep.o
-obj-$(CONFIG_SND_ES1938) += snd-hwdep.o
-obj-$(CONFIG_SND_FM801) += snd-hwdep.o
-obj-$(CONFIG_SND_SONICVIBES) += snd-hwdep.o
-obj-$(CONFIG_SND_EMU10K1) += snd-hwdep.o
-obj-$(CONFIG_SND_HDSP) += snd-hwdep.o
-obj-$(CONFIG_SND_YMFPCI) += snd-hwdep.o
-obj-$(CONFIG_SND_PC98_CS4232) += snd-hwdep.o
-obj-$(CONFIG_SND_VXPOCKET) += snd-hwdep.o
-obj-$(CONFIG_SND_VXP440) += snd-hwdep.o
-obj-$(CONFIG_SND_VX222) += snd-hwdep.o
obj-m := $(sort $(obj-m))
--- orig/sound/isa/Kconfig Mon Mar 1 11:37:22 2004
+++ linux/sound/isa/Kconfig Mon Mar 1 11:42:33 2004
@@ -6,6 +6,7 @@ menu "ISA devices"
config SND_AD1816A
tristate "Analog Devices SoundPort AD1816A"
depends on SND && ISAPNP
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -33,6 +34,7 @@ config SND_CS4231
config SND_CS4232
tristate "Generic Cirrus Logic CS4232 driver"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -42,6 +44,7 @@ config SND_CS4232
config SND_CS4236
tristate "Generic Cirrus Logic CS4236+ driver"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -51,6 +54,7 @@ config SND_CS4236
config SND_PC98_CS4232
tristate "NEC PC9800 CS4232 driver"
depends on SND && X86_PC9800
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -68,6 +72,7 @@ config SND_ES968
config SND_ES1688
tristate "Generic ESS ES688/ES1688 driver"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -76,6 +81,7 @@ config SND_ES1688
config SND_ES18XX
tristate "Generic ESS ES18xx driver"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -92,6 +98,7 @@ config SND_GUSCLASSIC
config SND_GUSEXTREME
tristate "Gravis UltraSound Extreme"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -127,6 +134,7 @@ config SND_INTERWAVE_STB
config SND_OPTI92X_AD1848
tristate "OPTi 82C92x - AD1848"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -136,6 +144,7 @@ config SND_OPTI92X_AD1848
config SND_OPTI92X_CS4231
tristate "OPTi 82C92x - CS4231"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -145,6 +154,7 @@ config SND_OPTI92X_CS4231
config SND_OPTI93X
tristate "OPTi 82C93x"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -153,6 +163,7 @@ config SND_OPTI93X
config SND_SB8
tristate "Sound Blaster 1.0/2.0/Pro (8-bit)"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -162,6 +173,7 @@ config SND_SB8
config SND_SB16
tristate "Sound Blaster 16 (PnP)"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -171,6 +183,7 @@ config SND_SB16
config SND_SBAWE
tristate "Sound Blaster AWE (32,64) (PnP)"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -188,6 +201,7 @@ config SND_SB16_CSP
config SND_WAVEFRONT
tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -197,6 +211,7 @@ config SND_WAVEFRONT
config SND_ALS100
tristate "Avance Logic ALS100/ALS120"
depends on SND && ISAPNP
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -206,6 +221,7 @@ config SND_ALS100
config SND_AZT2320
tristate "Aztech Systems AZT2320"
depends on SND && ISAPNP
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -221,6 +237,7 @@ config SND_CMI8330
config SND_DT019X
tristate "Diamond Technologies DT-019X, Avance Logic ALS-007"
depends on SND && ISAPNP
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -230,6 +247,7 @@ config SND_DT019X
config SND_OPL3SA2
tristate "Yamaha OPL3-SA2/SA3"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -245,6 +263,7 @@ config SND_SGALAXY
config SND_SSCAPE
tristate "Ensoniq SoundScape PnP driver"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
--- orig/sound/pci/Kconfig Mon Mar 1 11:37:22 2004
+++ linux/sound/pci/Kconfig Mon Mar 1 11:46:13 2004
@@ -14,6 +14,7 @@ config SND_ALI5451
config SND_AZT3328
tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)"
depends on SND && EXPERIMENTAL
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -46,6 +47,7 @@ config SND_CS46XX_NEW_DSP
config SND_CS4281
tristate "Cirrus Logic (Sound Fusion) CS4281"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -54,6 +56,7 @@ config SND_CS4281
config SND_EMU10K1
tristate "EMU10K1 (SB Live! & Audigy, E-mu APS)"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -101,6 +104,7 @@ config SND_RME9652
config SND_HDSP
tristate "RME Hammerfall DSP Audio"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -119,6 +123,7 @@ config SND_TRIDENT
config SND_YMFPCI
tristate "Yamaha YMF724/740/744/754"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -128,6 +133,7 @@ config SND_YMFPCI
config SND_ALS4000
tristate "Avance Logic ALS4000"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -136,6 +142,7 @@ config SND_ALS4000
config SND_CMIPCI
tristate "C-Media 8738, 8338"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -162,6 +169,7 @@ config SND_ENS1371
config SND_ES1938
tristate "ESS ES1938/1946/1969 (Solo-1)"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -186,6 +194,7 @@ config SND_MAESTRO3
config SND_FM801
tristate "ForteMedia FM801"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -232,6 +241,7 @@ config SND_INTEL8X0
config SND_SONICVIBES
tristate "S3 SonicVibes"
depends on SND
+ select SND_HWDEP
select SND_RAWMIDI
select SND_PCM
help
@@ -248,6 +258,7 @@ config SND_VIA82XX
config SND_VX222
tristate "Digigram VX222"
depends on SND
+ select SND_HWDEP
select SND_PCM
help
Say 'Y' or 'M' to include support for Digigram VX222 soundcards.
--- orig/sound/pcmcia/Kconfig Mon Mar 1 11:16:45 2004
+++ linux/sound/pcmcia/Kconfig Mon Mar 1 11:46:29 2004
@@ -6,6 +6,7 @@ menu "PCMCIA devices"
config SND_VXPOCKET
tristate "Digigram VXpocket"
depends on SND && PCMCIA && ISA
+ select SND_HWDEP
select SND_PCM
help
Say 'Y' or 'M' to include support for Digigram VXpocket soundcard.
@@ -13,6 +14,7 @@ config SND_VXPOCKET
config SND_VXP440
tristate "Digigram VXpocket 440"
depends on SND && PCMCIA && ISA
+ select SND_HWDEP
select SND_PCM
help
Say 'Y' or 'M' to include support for Digigram VXpocket 440 soundcard.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] 5/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile
2004-03-01 14:45 ` [PATCH] 4/5 " Russell King
@ 2004-03-01 14:46 ` Russell King
0 siblings, 0 replies; 10+ messages in thread
From: Russell King @ 2004-03-01 14:46 UTC (permalink / raw)
To: Alsa Devel list, Jaroslav Kysela
This is part of a patch series to clean up sound/core/Makefile in Linux
2.6.4-rc1.
- Add SND_TIMER for drivers which use the snd-timer module.
- Remove snd-timer from these drivers entries in sound/core/Makefile,
removing any sound/core/Makefile entries which are left empty.
- Since the "top level module dependency" lists are now gone, remove
the comment.
- Also, since we only mention objects once, remove the sorting of obj-m
--- orig/sound/core/Makefile Mon Mar 1 12:16:54 2004
+++ linux/sound/core/Makefile Mon Mar 1 12:16:33 2004
@@ -35,11 +35,3 @@ obj-$(CONFIG_SND_SEQUENCER) += snd-timer
obj-$(CONFIG_SND_OSSEMUL) += oss/
obj-$(CONFIG_SND_SEQUENCER) += seq/
obj-$(CONFIG_SND_BIT32_EMUL) += ioctl32/
-
-# Toplevel Module Dependency
-obj-$(CONFIG_SND_VIRMIDI) += snd-timer.o
-obj-$(CONFIG_SND_SERIAL_U16550) += snd-timer.o
-obj-$(CONFIG_SND_MTPAV) += snd-timer.o
-obj-$(CONFIG_SND_MPU401) += snd-timer.o
-
-obj-m := $(sort $(obj-m))
--- orig/sound/drivers/Kconfig Mon Mar 1 12:16:52 2004
+++ linux/sound/drivers/Kconfig Mon Mar 1 12:14:18 2004
@@ -15,6 +15,7 @@ config SND_DUMMY
config SND_VIRMIDI
tristate "Virtual MIDI soundcard"
depends on SND_SEQUENCER
+ select SND_TIMER
select SND_RAWMIDI
help
Say 'Y' or 'M' to include virtual MIDI driver. This driver allows to
@@ -23,6 +24,7 @@ config SND_VIRMIDI
config SND_MTPAV
tristate "MOTU MidiTimePiece AV multiport MIDI"
depends on SND
+ select SND_TIMER
select SND_RAWMIDI
help
Say 'Y' or 'M' to include support for MOTU MidiTimePiece AV multiport
@@ -31,6 +33,7 @@ config SND_MTPAV
config SND_SERIAL_U16550
tristate "UART16550 - MIDI only driver"
depends on SND
+ select SND_TIMER
select SND_RAWMIDI
help
Say 'Y' or 'M' to include support for MIDI serial port driver. It works
@@ -39,6 +42,7 @@ config SND_SERIAL_U16550
config SND_MPU401
tristate "Generic MPU-401 UART driver"
depends on SND
+ select SND_TIMER
select SND_RAWMIDI
help
Say 'Y' or 'M' to include support for MPU401 hardware using UART access.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] 1/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile
2004-03-01 14:42 ` [PATCH] 1/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile Russell King
2004-03-01 14:44 ` [PATCH] 2/5 " Russell King
@ 2004-03-01 15:27 ` Takashi Iwai
2004-03-01 15:28 ` Jaroslav Kysela
2004-03-01 17:48 ` Russell King
1 sibling, 2 replies; 10+ messages in thread
From: Takashi Iwai @ 2004-03-01 15:27 UTC (permalink / raw)
To: Russell King; +Cc: Alsa Devel list, Jaroslav Kysela
At Mon, 1 Mar 2004 14:42:31 +0000,
Russell King wrote:
>
> This is part of a patch series to clean up sound/core/Makefile in Linux
> 2.6.4-rc1.
>
> - Add SND_TIMER, SND_PCM, SND_HWDEP and SND_RAWMIDI configuration symbols.
> These symbols select which modules in sound/core get built, building
> snd-timer, snd-pcm, snd-hwdep and snd-rawmidi respectively.
>
> - Add reverse dependencies ("select") to select these symbols for core
> components where necessary.
>
> - Hide SND_OSSEMUL - we can select this when SND_MIXER_OSS, SND_PCM_OSS
> or SND_SEQUENCER_OSS are selected automatically.
>
> - Tweak Makefile to use these new symbols to build these modules.
>
> - Since we now build appropriate modules for core components according
> to the new configuration symbols, (eg, snd-timer if SND_SEQUENCER is
> selected) we can delete these duplications.
thanks, a nice work!
i vote for inclusion of this patchset.
(although we'll have a lot of work for 2.2/2.4 environment...)
--
Takashi Iwai <tiwai@suse.de> ALSA Developer - www.alsa-project.org
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] 1/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile
2004-03-01 15:27 ` [PATCH] 1/5 " Takashi Iwai
@ 2004-03-01 15:28 ` Jaroslav Kysela
2004-03-01 15:42 ` Takashi Iwai
2004-03-01 17:48 ` Russell King
1 sibling, 1 reply; 10+ messages in thread
From: Jaroslav Kysela @ 2004-03-01 15:28 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Russell King, Alsa Devel list
On Mon, 1 Mar 2004, Takashi Iwai wrote:
> thanks, a nice work!
>
> i vote for inclusion of this patchset.
> (although we'll have a lot of work for 2.2/2.4 environment...)
Yes, we need parsing of the Kconfig files now.
Jaroslav
-----
Jaroslav Kysela <perex@suse.cz>
Linux Kernel Sound Maintainer
ALSA Project, SuSE Labs
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] 1/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile
2004-03-01 15:28 ` Jaroslav Kysela
@ 2004-03-01 15:42 ` Takashi Iwai
2004-03-01 15:54 ` Jaroslav Kysela
0 siblings, 1 reply; 10+ messages in thread
From: Takashi Iwai @ 2004-03-01 15:42 UTC (permalink / raw)
To: Jaroslav Kysela; +Cc: Russell King, Alsa Devel list
At Mon, 1 Mar 2004 16:28:28 +0100 (CET),
Jaroslav wrote:
>
> On Mon, 1 Mar 2004, Takashi Iwai wrote:
>
> > thanks, a nice work!
> >
> > i vote for inclusion of this patchset.
> > (although we'll have a lot of work for 2.2/2.4 environment...)
>
> Yes, we need parsing of the Kconfig files now.
or, provide different Makefiles for old kernels?
Takashi
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] 1/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile
2004-03-01 15:42 ` Takashi Iwai
@ 2004-03-01 15:54 ` Jaroslav Kysela
0 siblings, 0 replies; 10+ messages in thread
From: Jaroslav Kysela @ 2004-03-01 15:54 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Alsa Devel list
On Mon, 1 Mar 2004, Takashi Iwai wrote:
> > Yes, we need parsing of the Kconfig files now.
>
> or, provide different Makefiles for old kernels?
I think that replacing mod-deps utility will be fine for the future
maintenance.
Jaroslav
-----
Jaroslav Kysela <perex@suse.cz>
Linux Kernel Sound Maintainer
ALSA Project, SuSE Labs
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] 1/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile
2004-03-01 15:27 ` [PATCH] 1/5 " Takashi Iwai
2004-03-01 15:28 ` Jaroslav Kysela
@ 2004-03-01 17:48 ` Russell King
1 sibling, 0 replies; 10+ messages in thread
From: Russell King @ 2004-03-01 17:48 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Alsa Devel list, Jaroslav Kysela
On Mon, Mar 01, 2004 at 04:27:42PM +0100, Takashi Iwai wrote:
> i vote for inclusion of this patchset.
> (although we'll have a lot of work for 2.2/2.4 environment...)
I plan to do some more of this over the coming weeks, but I'll pause
for the time being - I don't want to bloat my local tree with too
many ALSA changes. IOW, I'll wait for this set to make their way
through your good selves and to Linus before submitting any further
changes of this type. This will probably mean it'll be after 2.6.4
has been released.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2004-03-01 17:48 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <no.id>
2004-03-01 14:42 ` [PATCH] 1/5 Clean up Linux 2.6.4-rc1 sound/core/Makefile Russell King
2004-03-01 14:44 ` [PATCH] 2/5 " Russell King
2004-03-01 14:45 ` [PATCH] 3/5 " Russell King
2004-03-01 14:45 ` [PATCH] 4/5 " Russell King
2004-03-01 14:46 ` [PATCH] 5/5 " Russell King
2004-03-01 15:27 ` [PATCH] 1/5 " Takashi Iwai
2004-03-01 15:28 ` Jaroslav Kysela
2004-03-01 15:42 ` Takashi Iwai
2004-03-01 15:54 ` Jaroslav Kysela
2004-03-01 17:48 ` Russell King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox