projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
[powerpc.git]
/
sound
/
isa
/
Kconfig
diff --git
a/sound/isa/Kconfig
b/sound/isa/Kconfig
index
5c39483
..
5d6c300
100644
(file)
--- a/
sound/isa/Kconfig
+++ b/
sound/isa/Kconfig
@@
-6,12
+6,12
@@
menu "ISA devices"
config SND_AD1848_LIB
tristate
select SND_PCM
config SND_AD1848_LIB
tristate
select SND_PCM
- select SND_GENERIC_
PM
+ select SND_GENERIC_
DRIVER
config SND_CS4231_LIB
tristate
select SND_PCM
config SND_CS4231_LIB
tristate
select SND_PCM
- select SND_GENERIC_
PM
+ select SND_GENERIC_
DRIVER
config SND_AD1816A
tristate "Analog Devices SoundPort AD1816A"
config SND_AD1816A
tristate "Analog Devices SoundPort AD1816A"
@@
-97,6
+97,7
@@
config SND_ES1688
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
+ select SND_GENERIC_DRIVER
help
Say Y here to include support for ESS AudioDrive ES688 or
ES1688 chips.
help
Say Y here to include support for ESS AudioDrive ES688 or
ES1688 chips.
@@
-110,7
+111,7
@@
config SND_ES18XX
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
- select SND_GENERIC_
PM
+ select SND_GENERIC_
DRIVER
help
Say Y here to include support for ESS AudioDrive ES18xx chips.
help
Say Y here to include support for ESS AudioDrive ES18xx chips.
@@
-126,6
+127,7
@@
config SND_GUSCLASSIC
select SND_RAWMIDI
select SND_PCM
select SND_GUS_SYNTH
select SND_RAWMIDI
select SND_PCM
select SND_GUS_SYNTH
+ select SND_GENERIC_DRIVER
help
Say Y here to include support for Gravis UltraSound Classic
soundcards.
help
Say Y here to include support for Gravis UltraSound Classic
soundcards.
@@
-140,6
+142,7
@@
config SND_GUSEXTREME
select SND_MPU401_UART
select SND_PCM
select SND_GUS_SYNTH
select SND_MPU401_UART
select SND_PCM
select SND_GUS_SYNTH
+ select SND_GENERIC_DRIVER
help
Say Y here to include support for Gravis UltraSound Extreme
soundcards.
help
Say Y here to include support for Gravis UltraSound Extreme
soundcards.
@@
-153,6
+156,7
@@
config SND_GUSMAX
select SND_RAWMIDI
select SND_CS4231_LIB
select SND_GUS_SYNTH
select SND_RAWMIDI
select SND_CS4231_LIB
select SND_GUS_SYNTH
+ select SND_GENERIC_DRIVER
help
Say Y here to include support for Gravis UltraSound MAX
soundcards.
help
Say Y here to include support for Gravis UltraSound MAX
soundcards.
@@
-166,7
+170,7
@@
config SND_INTERWAVE
select SND_RAWMIDI
select SND_CS4231_LIB
select SND_GUS_SYNTH
select SND_RAWMIDI
select SND_CS4231_LIB
select SND_GUS_SYNTH
- select
ISAPNP
+ select
SND_GENERIC_DRIVER
help
Say Y here to include support for AMD InterWave based
soundcards (Gravis UltraSound Plug & Play, STB SoundRage32,
help
Say Y here to include support for AMD InterWave based
soundcards (Gravis UltraSound Plug & Play, STB SoundRage32,
@@
-181,7
+185,7
@@
config SND_INTERWAVE_STB
select SND_RAWMIDI
select SND_CS4231_LIB
select SND_GUS_SYNTH
select SND_RAWMIDI
select SND_CS4231_LIB
select SND_GUS_SYNTH
- select
ISAPNP
+ select
SND_GENERIC_DRIVER
help
Say Y here to include support for AMD InterWave based
soundcards with a TEA6330T bass and treble regulator
help
Say Y here to include support for AMD InterWave based
soundcards with a TEA6330T bass and treble regulator
@@
-224,6
+228,7
@@
config SND_OPTI93X
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
+ select SND_GENERIC_DRIVER
help
Say Y here to include support for soundcards based on Opti
82C93x chips.
help
Say Y here to include support for soundcards based on Opti
82C93x chips.
@@
-237,6
+242,7
@@
config SND_SB8
select SND_OPL3_LIB
select SND_RAWMIDI
select SND_PCM
select SND_OPL3_LIB
select SND_RAWMIDI
select SND_PCM
+ select SND_GENERIC_DRIVER
help
Say Y here to include support for Creative Sound Blaster 1.0/
2.0/Pro (8-bit) or 100% compatible soundcards.
help
Say Y here to include support for Creative Sound Blaster 1.0/
2.0/Pro (8-bit) or 100% compatible soundcards.
@@
-250,6
+256,7
@@
config SND_SB16
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
+ select SND_GENERIC_DRIVER
help
Say Y here to include support for Sound Blaster 16 soundcards
(including the Plug and Play version).
help
Say Y here to include support for Sound Blaster 16 soundcards
(including the Plug and Play version).
@@
-263,6
+270,7
@@
config SND_SBAWE
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_PCM
+ select SND_GENERIC_DRIVER
help
Say Y here to include support for Sound Blaster AWE soundcards
(including the Plug and Play version).
help
Say Y here to include support for Sound Blaster AWE soundcards
(including the Plug and Play version).