Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 276bd31ce5af01350465861af7aa6a25864eb108

Authored by Al Viro
Committed by Linus Torvalds
1 parent e9bcb173dd
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 7 changed files with 10 additions and 8 deletions Side-by-side Diff

include/sound/core.h
Diff comments   View file @ 276bd31
... ... @@ -360,11 +360,13 @@
360 360  
361 361 /* isadma.c */
362 362  
  363 +#ifdef CONFIG_ISA_DMA_API
363 364 #define DMA_MODE_NO_ENABLE 0x0100
364 365  
365 366 void snd_dma_program(unsigned long dma, unsigned long addr, unsigned int size, unsigned short mode);
366 367 void snd_dma_disable(unsigned long dma);
367 368 unsigned int snd_dma_pointer(unsigned long dma, unsigned int size);
  369 +#endif
368 370  
369 371 /* misc.c */
370 372  
... ... @@ -77,7 +77,7 @@
77 77 endmenu
78 78  
79 79 menu "Open Sound System"
80   - depends on SOUND!=n && (BROKEN || (!SPARC32 && !SPARC64))
  80 + depends on SOUND!=n
81 81  
82 82 config SOUND_PRIME
83 83 tristate "Open Sound System (DEPRECATED)"
... ... @@ -5,7 +5,7 @@
5 5  
6 6 snd-objs := sound.o init.o memory.o info.o control.o misc.o \
7 7 device.o wrappers.o
8   -ifeq ($(CONFIG_ISA),y)
  8 +ifeq ($(CONFIG_ISA_DMA_API),y)
9 9 snd-objs += isadma.o
10 10 endif
11 11 ifeq ($(CONFIG_SND_OSSEMUL),y)
... ... @@ -432,7 +432,7 @@
432 432 EXPORT_SYMBOL(snd_device_register);
433 433 EXPORT_SYMBOL(snd_device_free);
434 434 /* isadma.c */
435   -#ifdef CONFIG_ISA
  435 +#ifdef CONFIG_ISA_DMA_API
436 436 EXPORT_SYMBOL(snd_dma_program);
437 437 EXPORT_SYMBOL(snd_dma_disable);
438 438 EXPORT_SYMBOL(snd_dma_pointer);
1 1 # ALSA ISA drivers
2 2  
3 3 menu "ISA devices"
4   - depends on SND!=n && ISA
  4 + depends on SND!=n && ISA && ISA_DMA_API
5 5  
6 6 config SND_AD1848_LIB
7 7 tristate
... ... @@ -80,7 +80,7 @@
80 80  
81 81 config MIDI_EMU10K1
82 82 bool "Creative SBLive! MIDI (EXPERIMENTAL)"
83   - depends on SOUND_EMU10K1 && EXPERIMENTAL
  83 + depends on SOUND_EMU10K1 && EXPERIMENTAL && ISA_DMA_API
84 84 help
85 85 Say Y if you want to be able to use the OSS /dev/sequencer
86 86 interface. This code is still experimental.
... ... @@ -503,7 +503,7 @@
503 503  
504 504 config MIDI_VIA82CXXX
505 505 bool "VIA 82C686 MIDI"
506   - depends on SOUND_VIA82CXXX
  506 + depends on SOUND_VIA82CXXX && ISA_DMA_API
507 507 help
508 508 Answer Y to use the MIDI interface of the Via686. You may need to
509 509 enable this in the BIOS before it will work. This is for connection
... ... @@ -512,7 +512,7 @@
512 512  
513 513 config SOUND_OSS
514 514 tristate "OSS sound modules"
515   - depends on SOUND_PRIME
  515 + depends on SOUND_PRIME && ISA_DMA_API
516 516 help
517 517 OSS is the Open Sound System suite of sound card drivers. They make
518 518 sound programming easier since they provide a common API. Say Y or
... ... @@ -314,7 +314,7 @@
314 314  
315 315 config SND_ALS4000
316 316 tristate "Avance Logic ALS4000"
317   - depends on SND
  317 + depends on SND && ISA_DMA_API
318 318 select SND_OPL3_LIB
319 319 select SND_MPU401_UART
320 320 select SND_PCM