From: Tony Lindgren <tony@atomide.com>
Date: Fri, 25 Apr 2008 18:49:52 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~123^2~166
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4bb9f8b58ed7d14d276750d1792cef9b3aa1e9ec;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	sound/soc/Kconfig
	sound/soc/Makefile
---

4bb9f8b58ed7d14d276750d1792cef9b3aa1e9ec
diff --cc drivers/media/video/Kconfig
index f888f84e83d,fe9a4cc1414..2b81bb54d81
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@@ -697,10 -698,10 +706,12 @@@ source "drivers/media/video/cx88/Kconfi
  
  source "drivers/media/video/cx23885/Kconfig"
  
+ source "drivers/media/video/au0828/Kconfig"
+ 
  source "drivers/media/video/ivtv/Kconfig"
  
 +source drivers/media/video/omap/Kconfig
 +
  config VIDEO_M32R_AR
  	tristate "AR devices"
  	depends on M32R && VIDEO_V4L1
diff --cc sound/soc/Kconfig
index 52e613e282c,a3b51df2bea..18f28ac4bfe
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@@ -29,7 -29,7 +29,8 @@@ source "sound/soc/pxa/Kconfig
  source "sound/soc/s3c24xx/Kconfig"
  source "sound/soc/sh/Kconfig"
  source "sound/soc/fsl/Kconfig"
+ source "sound/soc/davinci/Kconfig"
 +source "sound/soc/omap/Kconfig"
  
  # Supported codecs
  source "sound/soc/codecs/Kconfig"
diff --cc sound/soc/Makefile
index 148a84dde69,e489dbdde45..782db212710
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@@ -1,4 -1,4 +1,4 @@@
  snd-soc-core-objs := soc-core.o soc-dapm.o
  
  obj-$(CONFIG_SND_SOC)	+= snd-soc-core.o
- obj-$(CONFIG_SND_SOC)	+= codecs/ at91/ pxa/ s3c24xx/ sh/ fsl/ omap/
 -obj-$(CONFIG_SND_SOC)	+= codecs/ at91/ pxa/ s3c24xx/ sh/ fsl/ davinci/
++obj-$(CONFIG_SND_SOC)	+= codecs/ at91/ pxa/ s3c24xx/ sh/ fsl/ davinci/ omap/