From: Tony Lindgren <tony@atomide.com>
Date: Wed, 24 Aug 2005 11:42:57 +0000 (+0300)
Subject: Merge with ../linux-2.6
X-Git-Tag: v2.6.13-omap1~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=11831a1047cb4e577bfd1f72d42d1f555008104d;p=linux-2.6-omap-h63xx.git

Merge with ../linux-2.6
---

11831a1047cb4e577bfd1f72d42d1f555008104d
diff --cc sound/oss/Kconfig
index 99ca8b7bb40,953e5f3ea03..0eb23d3b73f
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@@ -4,34 -4,9 +4,34 @@@
  # More hacking for modularisation.
  #
  # Prompt user for primary drivers.
 +config SOUND_OMAP
 +	tristate "OMAP Sound Driver"
 +	depends on SOUND_PRIME!=n && SOUND && ARCH_OMAP
 +	---help---
 +	  OMAP Audio driver
 +
 +config SOUND_OMAP_TSC2101
 +	tristate "TSC2101 Stereo Codec"
 +	depends on SOUND_OMAP && ( MACH_OMAP_H2 || MACH_OMAP_H3 )
 +	select OMAP_TSC2101
 +	select OMAP_UWIRE if ARCH_OMAP
 +	---help---
 +	  Tsc2101 Audio Codec Driver for OMAP will be enabled.
 +	  Will also Enable the following:
 +	  1. uWire Driver based on Platform
 +	  2. TSC2101 Glue driver
 +
 +config SOUND_OMAP_AIC23
 +	tristate "AIC23 Stereo Codec"
 +	depends on SOUND_OMAP && ( MACH_OMAP_INNOVATOR || MACH_OMAP_OSK )
 +	select SENSORS_TLV320AIC23 if ARCH_OMAP
 +	---help---
 +	  AIC23 Audio Codec Driver for OMAP will be enabled.
 +	  Additionally, AIC23 I2C support is enabled.
 +
  config SOUND_BT878
  	tristate "BT878 audio dma"
- 	depends on SOUND_PRIME
+ 	depends on SOUND_PRIME && PCI
  	---help---
  	  Audio DMA support for bt878 based grabber boards.  As you might have
  	  already noticed, bt878 is listed with two functions in /proc/pci.