Commit 616300bd authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] firewire: move it one level up 



Move firewire to one level up, as the dvb subdirectory will be
removed.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9a0bf528

drivers/media/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ 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

source "drivers/media/dvb-frontends/Kconfig"

drivers/media/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/

drivers/media/dvb/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -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"

drivers/media/dvb/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -16,5 +16,3 @@ obj-y := ttpci/ \ 
		mantis/		\

		ngene/		\

		ddbridge/
 


obj-$(CONFIG_DVB_FIREDTV)	+= firewire/