| commit | 616300bd51bee80d2d122c205866aa4c20adbaa8 | [log] [tgz] |
|---|---|---|
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | Thu Jun 14 16:35:55 2012 -0300 |
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | Mon Aug 13 23:20:36 2012 -0300 |
| tree | 732800e883c2b723cb5a2bf96cc6c4c0687cac20 | |
| parent | 9a0bf528b4d66b605f02634236da085595c22101 [diff] |
[media] firewire: move it one level up Move firewire to one level up, as the dvb subdirectory will be removed. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 180fb13..b7d2802 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig
@@ -164,8 +164,12 @@ 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/drivers/media/Makefile b/drivers/media/Makefile index f95b9e3..37e448c 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile
@@ -12,3 +12,4 @@ obj-$(CONFIG_VIDEO_DEV) += radio/ obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/ dvb-frontends/ +obj-$(CONFIG_DVB_FIREDTV) += firewire/
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig index e610c36..b466546 100644 --- a/drivers/media/dvb/Kconfig +++ b/drivers/media/dvb/Kconfig
@@ -39,10 +39,6 @@ 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/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile index 0cee8f8..fc248268 100644 --- a/drivers/media/dvb/Makefile +++ b/drivers/media/dvb/Makefile
@@ -16,5 +16,3 @@ mantis/ \ ngene/ \ ddbridge/ - -obj-$(CONFIG_DVB_FIREDTV) += firewire/
diff --git a/drivers/media/dvb/firewire/Kconfig b/drivers/media/firewire/Kconfig similarity index 100% rename from drivers/media/dvb/firewire/Kconfig rename to drivers/media/firewire/Kconfig
diff --git a/drivers/media/dvb/firewire/Makefile b/drivers/media/firewire/Makefile similarity index 100% rename from drivers/media/dvb/firewire/Makefile rename to drivers/media/firewire/Makefile
diff --git a/drivers/media/dvb/firewire/firedtv-avc.c b/drivers/media/firewire/firedtv-avc.c similarity index 100% rename from drivers/media/dvb/firewire/firedtv-avc.c rename to drivers/media/firewire/firedtv-avc.c
diff --git a/drivers/media/dvb/firewire/firedtv-ci.c b/drivers/media/firewire/firedtv-ci.c similarity index 100% rename from drivers/media/dvb/firewire/firedtv-ci.c rename to drivers/media/firewire/firedtv-ci.c
diff --git a/drivers/media/dvb/firewire/firedtv-dvb.c b/drivers/media/firewire/firedtv-dvb.c similarity index 100% rename from drivers/media/dvb/firewire/firedtv-dvb.c rename to drivers/media/firewire/firedtv-dvb.c
diff --git a/drivers/media/dvb/firewire/firedtv-fe.c b/drivers/media/firewire/firedtv-fe.c similarity index 100% rename from drivers/media/dvb/firewire/firedtv-fe.c rename to drivers/media/firewire/firedtv-fe.c
diff --git a/drivers/media/dvb/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c similarity index 100% rename from drivers/media/dvb/firewire/firedtv-fw.c rename to drivers/media/firewire/firedtv-fw.c
diff --git a/drivers/media/dvb/firewire/firedtv-rc.c b/drivers/media/firewire/firedtv-rc.c similarity index 100% rename from drivers/media/dvb/firewire/firedtv-rc.c rename to drivers/media/firewire/firedtv-rc.c
diff --git a/drivers/media/dvb/firewire/firedtv.h b/drivers/media/firewire/firedtv.h similarity index 100% rename from drivers/media/dvb/firewire/firedtv.h rename to drivers/media/firewire/firedtv.h