---

yaml --- r: 330844 b: refs/heads/master c: ed0c8b5 h: refs/heads/master v: v3
git-mirror · Aug 14, 2012 · 3e9b833 · 3e9b833
1 parent e14703a
commit 3e9b833
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccae7af2bf07dfef69cc2eb6ebc9e1ff15addfbd
+refs/heads/master: ed0c8b5465d6cec5458d9a3041a5167d83f40fdb
diff --git a/trunk/drivers/media/common/Kconfig b/trunk/drivers/media/common/Kconfig
@@ -1,11 +1,2 @@
-config VIDEO_SAA7146
-	tristate
-	depends on I2C && PCI
-
-config VIDEO_SAA7146_VV
-	tristate
-	depends on VIDEO_V4L2
-	select VIDEOBUF_DMA_SG
-	select VIDEO_SAA7146
-
 source "drivers/media/common/b2c2/Kconfig"
+source "drivers/media/common/saa7146/Kconfig"
diff --git a/trunk/drivers/media/common/Makefile b/trunk/drivers/media/common/Makefile
@@ -1,6 +1 @@
-saa7146-objs    := saa7146_i2c.o saa7146_core.o
-saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
-
-obj-y += b2c2/
-obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
-obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
+obj-y += b2c2/ saa7146/
diff --git a/trunk/drivers/media/common/saa7146/Kconfig b/trunk/drivers/media/common/saa7146/Kconfig
@@ -0,0 +1,9 @@
+config VIDEO_SAA7146
+	tristate
+	depends on I2C && PCI
+
+config VIDEO_SAA7146_VV
+	tristate
+	depends on VIDEO_V4L2
+	select VIDEOBUF_DMA_SG
+	select VIDEO_SAA7146
diff --git a/trunk/drivers/media/common/saa7146/Makefile b/trunk/drivers/media/common/saa7146/Makefile
@@ -0,0 +1,5 @@
+saa7146-objs    := saa7146_i2c.o saa7146_core.o
+saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
+
+obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
+obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
diff --git a/trunk/drivers/media/common/saa7146_core.c → ...ivers/media/common/saa7146/saa7146_core.c b/trunk/drivers/media/common/saa7146_core.c → ...ivers/media/common/saa7146/saa7146_core.c
diff --git a/trunk/drivers/media/common/saa7146_fops.c → ...ivers/media/common/saa7146/saa7146_fops.c b/trunk/drivers/media/common/saa7146_fops.c → ...ivers/media/common/saa7146/saa7146_fops.c
diff --git a/trunk/drivers/media/common/saa7146_hlp.c → ...rivers/media/common/saa7146/saa7146_hlp.c b/trunk/drivers/media/common/saa7146_hlp.c → ...rivers/media/common/saa7146/saa7146_hlp.c
diff --git a/trunk/drivers/media/common/saa7146_i2c.c → ...rivers/media/common/saa7146/saa7146_i2c.c b/trunk/drivers/media/common/saa7146_i2c.c → ...rivers/media/common/saa7146/saa7146_i2c.c
diff --git a/trunk/drivers/media/common/saa7146_vbi.c → ...rivers/media/common/saa7146/saa7146_vbi.c b/trunk/drivers/media/common/saa7146_vbi.c → ...rivers/media/common/saa7146/saa7146_vbi.c
diff --git a/trunk/drivers/media/common/saa7146_video.c → ...vers/media/common/saa7146/saa7146_video.c b/trunk/drivers/media/common/saa7146_video.c → ...vers/media/common/saa7146/saa7146_video.c