---

yaml --- r: 131733 b: refs/heads/master c: a70f81c h: refs/heads/master i: 131731: b6ad8ad v: v3
git-mirror · Feb 24, 2009 · a4aa08f · a4aa08f
1 parent 90bbb35
commit a4aa08f
Show file tree

Hide file tree

Showing 21 changed files with 516 additions and 516 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 291f006efeebeeb2073289e44efb8f97cf157220
+refs/heads/master: a70f81c1c0dac113ac4705e7701e2676e67905cd
diff --git a/trunk/drivers/media/dvb/Kconfig b/trunk/drivers/media/dvb/Kconfig
@@ -51,7 +51,7 @@ comment "Supported SDMC DM1105 Adapters"
 	depends on DVB_CORE && PCI && I2C
 source "drivers/media/dvb/dm1105/Kconfig"
 
-source "drivers/media/dvb/firesat/Kconfig"
+source "drivers/media/dvb/firewire/Kconfig"
 
 comment "Supported DVB Frontends"
 	depends on DVB_CORE

diff --git a/trunk/drivers/media/dvb/Makefile b/trunk/drivers/media/dvb/Makefile
@@ -4,4 +4,4 @@
 
 obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/
 
-obj-$(CONFIG_DVB_FIREDTV)	+= firesat/
+obj-$(CONFIG_DVB_FIREDTV)	+= firewire/
diff --git a/trunk/drivers/media/dvb/firesat/cmp.h b/trunk/drivers/media/dvb/firesat/cmp.h
diff --git a/trunk/drivers/media/dvb/firesat/firesat-ci.h b/trunk/drivers/media/dvb/firesat/firesat-ci.h
diff --git a/trunk/drivers/media/dvb/firesat/firesat-rc.h b/trunk/drivers/media/dvb/firesat/firesat-rc.h
diff --git a/trunk/drivers/media/dvb/firesat/Kconfig → trunk/drivers/media/dvb/firewire/Kconfig b/trunk/drivers/media/dvb/firesat/Kconfig → trunk/drivers/media/dvb/firewire/Kconfig
diff --git a/trunk/drivers/media/dvb/firesat/Makefile → trunk/drivers/media/dvb/firewire/Makefile b/trunk/drivers/media/dvb/firesat/Makefile → trunk/drivers/media/dvb/firewire/Makefile
@@ -1,11 +1,11 @@
-firedtv-objs := firesat_1394.o	\
-		firesat_dvb.o	\
-		firesat_fe.o	\
-		firesat_iso.o	\
-		avc_api.o	\
+firedtv-objs := firedtv-1394.o	\
+		firedtv-dvb.o	\
+		firedtv-fe.o	\
+		firedtv-iso.o	\
+		avc.o		\
 		cmp.o		\
-		firesat-rc.o	\
-		firesat-ci.o
+		firedtv-rc.o	\
+		firedtv-ci.o
 
 obj-$(CONFIG_DVB_FIREDTV) += firedtv.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		obj-y := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/

		obj-$(CONFIG_DVB_FIREDTV) += firesat/
		obj-$(CONFIG_DVB_FIREDTV) += firewire/