---

yaml --- r: 330839 b: refs/heads/master c: 616300b h: refs/heads/master i: 330837: f077ace 330835: 1675e28 330831: ad052d5 v: v3
git-mirror · Aug 14, 2012 · ee816b1 · ee816b1
1 parent bf2b054
commit ee816b1
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a0bf528b4d66b605f02634236da085595c22101
+refs/heads/master: 616300bd51bee80d2d122c205866aa4c20adbaa8
diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
@@ -164,8 +164,12 @@ source "drivers/media/radio/Kconfig"
 source "drivers/media/dvb-core/Kconfig"
 source "drivers/media/dvb/Kconfig"
 
+comment "Supported FireWire (IEEE 1394) Adapters"
+	depends on DVB_CORE && FIREWIRE
+source "drivers/media/firewire/Kconfig"
+
 comment "Supported DVB Frontends"
-        depends on DVB_CORE
+	depends on DVB_CORE
 source "drivers/media/dvb-frontends/Kconfig"
 
 endif # MEDIA_SUPPORT
diff --git a/trunk/drivers/media/Makefile b/trunk/drivers/media/Makefile
@@ -12,3 +12,4 @@ obj-y += v4l2-core/ common/ rc/ video/
 
 obj-$(CONFIG_VIDEO_DEV) += radio/
 obj-$(CONFIG_DVB_CORE)  += dvb-core/ dvb/ dvb-frontends/
+obj-$(CONFIG_DVB_FIREDTV) += firewire/
diff --git a/trunk/drivers/media/dvb/Kconfig b/trunk/drivers/media/dvb/Kconfig
@@ -39,10 +39,6 @@ comment "Supported SDMC DM1105 Adapters"
 	depends on DVB_CORE && PCI && I2C
 source "drivers/media/dvb/dm1105/Kconfig"
 
-comment "Supported FireWire (IEEE 1394) Adapters"
-	depends on DVB_CORE && FIREWIRE
-source "drivers/media/dvb/firewire/Kconfig"
-
 comment "Supported Earthsoft PT1 Adapters"
 	depends on DVB_CORE && PCI && I2C
 source "drivers/media/dvb/pt1/Kconfig"

diff --git a/trunk/drivers/media/dvb/Makefile b/trunk/drivers/media/dvb/Makefile
@@ -16,5 +16,3 @@ obj-y        :=	ttpci/		\
 		mantis/		\
 		ngene/		\
 		ddbridge/
-
-obj-$(CONFIG_DVB_FIREDTV)	+= firewire/
diff --git a/trunk/drivers/media/dvb/firewire/Kconfig → trunk/drivers/media/firewire/Kconfig b/trunk/drivers/media/dvb/firewire/Kconfig → trunk/drivers/media/firewire/Kconfig
diff --git a/trunk/drivers/media/dvb/firewire/Makefile → trunk/drivers/media/firewire/Makefile b/trunk/drivers/media/dvb/firewire/Makefile → trunk/drivers/media/firewire/Makefile
diff --git a/.../drivers/media/dvb/firewire/firedtv-avc.c → trunk/drivers/media/firewire/firedtv-avc.c b/.../drivers/media/dvb/firewire/firedtv-avc.c → trunk/drivers/media/firewire/firedtv-avc.c
diff --git a/...k/drivers/media/dvb/firewire/firedtv-ci.c → trunk/drivers/media/firewire/firedtv-ci.c b/...k/drivers/media/dvb/firewire/firedtv-ci.c → trunk/drivers/media/firewire/firedtv-ci.c
diff --git a/.../drivers/media/dvb/firewire/firedtv-dvb.c → trunk/drivers/media/firewire/firedtv-dvb.c b/.../drivers/media/dvb/firewire/firedtv-dvb.c → trunk/drivers/media/firewire/firedtv-dvb.c
diff --git a/...k/drivers/media/dvb/firewire/firedtv-fe.c → trunk/drivers/media/firewire/firedtv-fe.c b/...k/drivers/media/dvb/firewire/firedtv-fe.c → trunk/drivers/media/firewire/firedtv-fe.c
diff --git a/...k/drivers/media/dvb/firewire/firedtv-fw.c → trunk/drivers/media/firewire/firedtv-fw.c b/...k/drivers/media/dvb/firewire/firedtv-fw.c → trunk/drivers/media/firewire/firedtv-fw.c
diff --git a/...k/drivers/media/dvb/firewire/firedtv-rc.c → trunk/drivers/media/firewire/firedtv-rc.c b/...k/drivers/media/dvb/firewire/firedtv-rc.c → trunk/drivers/media/firewire/firedtv-rc.c
diff --git a/trunk/drivers/media/dvb/firewire/firedtv.h → trunk/drivers/media/firewire/firedtv.h b/trunk/drivers/media/dvb/firewire/firedtv.h → trunk/drivers/media/firewire/firedtv.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ obj-y += v4l2-core/ common/ rc/ video/

		obj-$(CONFIG_VIDEO_DEV) += radio/
		obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/ dvb-frontends/
		obj-$(CONFIG_DVB_FIREDTV) += firewire/