From: Tony Lindgren <tony@atomide.com>
Date: Mon, 14 Nov 2005 23:54:02 +0000 (-0800)
Subject: Merge with /home/tmlind/src/kernel/linux-2.6
X-Git-Tag: v2.6.15-omap2~95
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f8e4a92b76e17179ad540405d7ec50ac9385066f;p=linux-2.6-omap-h63xx.git

Merge with /home/tmlind/src/kernel/linux-2.6
---

f8e4a92b76e17179ad540405d7ec50ac9385066f
diff --cc drivers/media/video/Makefile
index e054ce25912,82060f9909d..febce335a11
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@@ -54,6 -55,7 +55,8 @@@ obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.
  obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
  
  obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
 +obj-$(CONFIG_VIDEO_OMAP_CAMERA) += omap/
  
+ obj-$(CONFIG_VIDEO_DECODER)     += saa7115.o cx25840/ saa7127.o
+ 
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core