diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/oss/Kconfig | 14 | ||||
| -rw-r--r-- | sound/ppc/toonie.c | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 6275266dde2..558c6ed443b 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -478,6 +478,20 @@ config SOUND_ACI_MIXER This driver is also available as a module and will be called aci. +config SOUND_CS4232 + tristate "Crystal CS4232 based (PnP) cards" + depends on SOUND_OSS + help + Say Y here if you have a card based on the Crystal CS4232 chip set, + which uses its own Plug and Play protocol. + + If you compile the driver into the kernel, you have to add + "cs4232=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the kernel + command line. + + See <file:Documentation/sound/oss/CS4232> for more information on + configuring this card. + config SOUND_VMIDI tristate "Loopback MIDI device support" depends on SOUND_OSS diff --git a/sound/ppc/toonie.c b/sound/ppc/toonie.c index 4e595172e42..1ac7c8552f5 100644 --- a/sound/ppc/toonie.c +++ b/sound/ppc/toonie.c @@ -335,7 +335,7 @@ static void toonie_cleanup(struct snd_pmac *chip) chip->mixer_data = NULL; } -int snd_pmac_toonie_init(struct snd_pmac *chip) +int __init snd_pmac_toonie_init(struct snd_pmac *chip) { struct pmac_toonie *mix; |