From 616300bd51bee80d2d122c205866aa4c20adbaa8 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 14 Jun 2012 16:35:55 -0300
Subject: [PATCH] [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>
---
drivers/media/Kconfig | 6 +++++-
drivers/media/Makefile | 1 +
drivers/media/dvb/Kconfig | 4 ----
drivers/media/dvb/Makefile | 2 --
drivers/media/{dvb => }/firewire/Kconfig | 0
drivers/media/{dvb => }/firewire/Makefile | 0
drivers/media/{dvb => }/firewire/firedtv-avc.c | 0
drivers/media/{dvb => }/firewire/firedtv-ci.c | 0
drivers/media/{dvb => }/firewire/firedtv-dvb.c | 0
drivers/media/{dvb => }/firewire/firedtv-fe.c | 0
drivers/media/{dvb => }/firewire/firedtv-fw.c | 0
drivers/media/{dvb => }/firewire/firedtv-rc.c | 0
drivers/media/{dvb => }/firewire/firedtv.h | 0
13 files changed, 6 insertions(+), 7 deletions(-)
rename drivers/media/{dvb => }/firewire/Kconfig (100%)
rename drivers/media/{dvb => }/firewire/Makefile (100%)
rename drivers/media/{dvb => }/firewire/firedtv-avc.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-ci.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-dvb.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-fe.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-fw.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv-rc.c (100%)
rename drivers/media/{dvb => }/firewire/firedtv.h (100%)
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 180fb1394c46..b7d2802e6a3f 100644
--- a/drivers/media/Kconfig
+++ b/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/drivers/media/Makefile b/drivers/media/Makefile
index f95b9e3204c1..37e448cafb75 100644
--- a/drivers/media/Makefile
+++ b/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/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index e610c361d185..b4665460c74d 100644
--- a/drivers/media/dvb/Kconfig
+++ b/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/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile
index 0cee8f82a5d4..fc248268cb5a 100644
--- a/drivers/media/dvb/Makefile
+++ b/drivers/media/dvb/Makefile
@@ -16,5 +16,3 @@ obj-y := ttpci/ \
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
--
GitLab