[ALSA] Fix SB-module dependency with PCI drivers

A few PCI drivers like ALS4000 and CS5530 require the SB16-codes.
This patch fixes / improves the dependency between SB modules and
PCI drivers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

2 files changed, 27 insertions, 14 deletions

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index cf3803cd579..b90ddabae2e 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -11,6 +11,19 @@ config SND_CS4231_LIB
         tristate
         select SND_PCM
 
+config SND_SB_COMMON
+        tristate
+
+config SND_SB8_DSP
+        tristate
+        select SND_PCM
+        select SND_SB_COMMON
+
+config SND_SB16_DSP
+        tristate
+        select SND_PCM
+        select SND_SB_COMMON
+
 config SND_ADLIB
         tristate "AdLib FM card"
         depends on SND
@@ -55,7 +68,7 @@ config SND_ALS100
         select ISAPNP
         select SND_OPL3_LIB
         select SND_MPU401_UART
-        select SND_PCM
+        select SND_SB16_DSP
         help
           Say Y here to include support for soundcards based on Avance
           Logic ALS100, ALS110, ALS120 and ALS200 chips.
@@ -81,6 +94,7 @@ config SND_CMI8330
         tristate "C-Media CMI8330"
         depends on SND
         select SND_AD1848_LIB
+        select SND_SB16_DSP
         help
           Say Y here to include support for soundcards based on the
           C-Media CMI8330 chip.
@@ -132,7 +146,7 @@ config SND_DT019X
         select ISAPNP
         select SND_OPL3_LIB
         select SND_MPU401_UART
-        select SND_PCM
+        select SND_SB16_DSP
         help
           Say Y here to include support for soundcards based on the
           Diamond Technologies DT-019X or Avance Logic ALS-007 chips.
@@ -145,7 +159,7 @@ config SND_ES968
         depends on SND && PNP && ISA
         select ISAPNP
         select SND_MPU401_UART
-        select SND_PCM
+        select SND_SB8_DSP
         help
           Say Y here to include support for ESS AudioDrive ES968 chips.
 
@@ -321,7 +335,7 @@ config SND_SB8
         depends on SND
         select SND_OPL3_LIB
         select SND_RAWMIDI
-        select SND_PCM
+        select SND_SB8_DSP
         help
           Say Y here to include support for Creative Sound Blaster 1.0/
           2.0/Pro (8-bit) or 100% compatible soundcards.
@@ -334,7 +348,7 @@ config SND_SB16
         depends on SND
         select SND_OPL3_LIB
         select SND_MPU401_UART
-        select SND_PCM
+        select SND_SB16_DSP
         help
           Say Y here to include support for Sound Blaster 16 soundcards
           (including the Plug and Play version).
@@ -347,7 +361,7 @@ config SND_SBAWE
         depends on SND
         select SND_OPL3_LIB
         select SND_MPU401_UART
-        select SND_PCM
+        select SND_SB16_DSP
         help
           Say Y here to include support for Sound Blaster AWE soundcards
           (including the Plug and Play version).
diff --git a/sound/isa/sb/Makefile b/sound/isa/sb/Makefile
index fd9d9c5726f..556e6692802 100644
--- a/sound/isa/sb/Makefile
+++ b/sound/isa/sb/Makefile
@@ -22,14 +22,13 @@ snd-es968-objs := es968.o
 sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))
 
 # Toplevel Module Dependency
-obj-$(CONFIG_SND_ALS100) += snd-sb16-dsp.o snd-sb-common.o
-obj-$(CONFIG_SND_CMI8330) += snd-sb16-dsp.o snd-sb-common.o
-obj-$(CONFIG_SND_DT019X) += snd-sb16-dsp.o snd-sb-common.o
-obj-$(CONFIG_SND_SB8) += snd-sb8.o snd-sb8-dsp.o snd-sb-common.o
-obj-$(CONFIG_SND_SB16) += snd-sb16.o snd-sb16-dsp.o snd-sb-common.o
-obj-$(CONFIG_SND_SBAWE) += snd-sbawe.o snd-sb16-dsp.o snd-sb-common.o
-obj-$(CONFIG_SND_ES968) += snd-es968.o snd-sb8-dsp.o snd-sb-common.o
-obj-$(CONFIG_SND_ALS4000) += snd-sb-common.o
+obj-$(CONFIG_SND_SB_COMMON) += snd-sb-common.o
+obj-$(CONFIG_SND_SB16_DSP) += snd-sb16-dsp.o
+obj-$(CONFIG_SND_SB8_DSP) += snd-sb8-dsp.o
+obj-$(CONFIG_SND_SB8) += snd-sb8.o
+obj-$(CONFIG_SND_SB16) += snd-sb16.o
+obj-$(CONFIG_SND_SBAWE) += snd-sbawe.o
+obj-$(CONFIG_SND_ES968) += snd-es968.o
 ifeq ($(CONFIG_SND_SB16_CSP),y)
   obj-$(CONFIG_SND_SB16) += snd-sb16-csp.o
   obj-$(CONFIG_SND_SBAWE) += snd-sb16-csp.o