---

yaml --- r: 330859 b: refs/heads/master c: cb7a01a h: refs/heads/master i: 330857: d3de5bd 330855: b97ffc7 v: v3
git-mirror · Aug 15, 2012 · 8629110 · 8629110
1 parent a3a85c4
commit 8629110
Show file tree

Hide file tree

Showing 125 changed files with 672 additions and 690 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0af8fa4dad0839f844fd0633e1936493f6d685a
+refs/heads/master: cb7a01ac324bf2ee2c666f37ac867e4135f9785a
diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
@@ -151,18 +151,15 @@ source "drivers/media/rc/Kconfig"
 
 source "drivers/media/tuners/Kconfig"
 
+source "drivers/media/i2c/Kconfig"
+
 #
-# Video/Radio/Hybrid adapters
+# V4L platform/mem2mem drivers
 #
-
 source "drivers/media/video/Kconfig"
 
 source "drivers/media/radio/Kconfig"
 
-#
-# DVB adapters
-#
-
 source "drivers/media/pci/Kconfig"
 source "drivers/media/usb/Kconfig"
 source "drivers/media/mmc/Kconfig"

diff --git a/trunk/drivers/media/Makefile b/trunk/drivers/media/Makefile
@@ -9,7 +9,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
 endif
 
 obj-y += tuners/ common/ rc/ video/
-obj-y += pci/ usb/ mmc/ firewire/ parport/
+obj-y += i2c/ pci/ usb/ mmc/ firewire/ parport/
 
 obj-$(CONFIG_VIDEO_DEV) += radio/ v4l2-core/
 obj-$(CONFIG_DVB_CORE)  += dvb-core/ dvb-frontends/