Commit 276bd31c authored Aug 23, 2005 by Al Viro Committed by Linus Torvalds Aug 23, 2005

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



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>

parent e9bcb173

include/sound/core.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -360,11 +360,13 @@ int snd_device_free_all(snd_card_t *card, snd_device_cmd_t cmd);

		/* isadma.c */

		#ifdef CONFIG_ISA_DMA_API
		#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_disable(unsigned long dma);
		unsigned int snd_dma_pointer(unsigned long dma, unsigned int size);
		#endif

		/* misc.c */

sound/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ source "sound/parisc/Kconfig"
		endmenu

		menu "Open Sound System"
		depends on SOUND!=n && (BROKEN \|\| (!SPARC32 && !SPARC64))
		depends on SOUND!=n

		config SOUND_PRIME
		tristate "Open Sound System (DEPRECATED)"

sound/core/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@

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

sound/core/sound.c

+1 −1

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

sound/isa/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		# ALSA ISA drivers

		menu "ISA devices"
		depends on SND!=n && ISA
		depends on SND!=n && ISA && ISA_DMA_API

		config SND_AD1848_LIB
		tristate