Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] Kconfig fix (ISA_DMA_API and sound/*)

Browse source 
fixed kconfig dependencies on ISA_DMA_API for parts of sound/* that rely
on it.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2005-08-23 22:45:06 +01:00 committed by Linus Torvalds
parent e9bcb173dd
commit 276bd31ce5
7 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sound/core.h
View file

@ -360,11 +360,13 @@ int snd_device_free_all(snd_card_t *card, snd_device_cmd_t cmd);
/* isadma.c */ /* isadma.c */
#ifdef CONFIG_ISA_DMA_API
#define DMA_MODE_NO_ENABLE 0x0100 #define DMA_MODE_NO_ENABLE 0x0100
void snd_dma_program(unsigned long dma, unsigned long addr, unsigned int size, unsigned short mode); void snd_dma_program(unsigned long dma, unsigned long addr, unsigned int size, unsigned short mode);
void snd_dma_disable(unsigned long dma); void snd_dma_disable(unsigned long dma);
unsigned int snd_dma_pointer(unsigned long dma, unsigned int size); unsigned int snd_dma_pointer(unsigned long dma, unsigned int size);
#endif
/* misc.c */ /* misc.c */

2
sound/Kconfig
View file

@ -77,7 +77,7 @@ source "sound/parisc/Kconfig"
endmenu endmenu
menu "Open Sound System" menu "Open Sound System"
depends on SOUND!=n && (BROKEN || (!SPARC32 && !SPARC64)) depends on SOUND!=n
config SOUND_PRIME config SOUND_PRIME
tristate "Open Sound System (DEPRECATED)" tristate "Open Sound System (DEPRECATED)"

2
sound/core/Makefile
View file

@ -5,7 +5,7 @@
snd-objs := sound.o init.o memory.o info.o control.o misc.o \ snd-objs := sound.o init.o memory.o info.o control.o misc.o \
device.o wrappers.o device.o wrappers.o
ifeq ($(CONFIG_ISA),y) ifeq ($(CONFIG_ISA_DMA_API),y)
snd-objs += isadma.o snd-objs += isadma.o
endif endif
ifeq ($(CONFIG_SND_OSSEMUL),y) ifeq ($(CONFIG_SND_OSSEMUL),y)

2
sound/core/sound.c
View file

@ -432,7 +432,7 @@ EXPORT_SYMBOL(snd_device_new);
EXPORT_SYMBOL(snd_device_register); EXPORT_SYMBOL(snd_device_register);
EXPORT_SYMBOL(snd_device_free); EXPORT_SYMBOL(snd_device_free);
/* isadma.c */ /* isadma.c */
#ifdef CONFIG_ISA #ifdef CONFIG_ISA_DMA_API
EXPORT_SYMBOL(snd_dma_program); EXPORT_SYMBOL(snd_dma_program);
EXPORT_SYMBOL(snd_dma_disable); EXPORT_SYMBOL(snd_dma_disable);
EXPORT_SYMBOL(snd_dma_pointer); EXPORT_SYMBOL(snd_dma_pointer);

2
sound/isa/Kconfig
View file

@ -1,7 +1,7 @@
# ALSA ISA drivers # ALSA ISA drivers
menu "ISA devices" menu "ISA devices"
depends on SND!=n && ISA depends on SND!=n && ISA && ISA_DMA_API
config SND_AD1848_LIB config SND_AD1848_LIB
tristate tristate

6
sound/oss/Kconfig
View file

@ -80,7 +80,7 @@ config SOUND_EMU10K1
config MIDI_EMU10K1 config MIDI_EMU10K1
bool "Creative SBLive! MIDI (EXPERIMENTAL)" bool "Creative SBLive! MIDI (EXPERIMENTAL)"
depends on SOUND_EMU10K1 && EXPERIMENTAL depends on SOUND_EMU10K1 && EXPERIMENTAL && ISA_DMA_API
help help
Say Y if you want to be able to use the OSS /dev/sequencer Say Y if you want to be able to use the OSS /dev/sequencer
interface. This code is still experimental. interface. This code is still experimental.
@ -503,7 +503,7 @@ config SOUND_VIA82CXXX
config MIDI_VIA82CXXX config MIDI_VIA82CXXX
bool "VIA 82C686 MIDI" bool "VIA 82C686 MIDI"
depends on SOUND_VIA82CXXX depends on SOUND_VIA82CXXX && ISA_DMA_API
help help
Answer Y to use the MIDI interface of the Via686. You may need to Answer Y to use the MIDI interface of the Via686. You may need to
enable this in the BIOS before it will work. This is for connection enable this in the BIOS before it will work. This is for connection
@ -512,7 +512,7 @@ config MIDI_VIA82CXXX
config SOUND_OSS config SOUND_OSS
tristate "OSS sound modules" tristate "OSS sound modules"
depends on SOUND_PRIME depends on SOUND_PRIME && ISA_DMA_API
help help
OSS is the Open Sound System suite of sound card drivers. They make OSS is the Open Sound System suite of sound card drivers. They make
sound programming easier since they provide a common API. Say Y or sound programming easier since they provide a common API. Say Y or

2
sound/pci/Kconfig
View file

@ -314,7 +314,7 @@ config SND_YMFPCI
config SND_ALS4000 config SND_ALS4000
tristate "Avance Logic ALS4000" tristate "Avance Logic ALS4000"
depends on SND depends on SND && ISA_DMA_API
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_PCM select SND_PCM