Commit ccae7af2 authored Jun 14, 2012 by Mauro Carvalho Chehab

[media] common: move media/common/tuners to media/tuners



Move the tuners one level up, as the "common" directory will be used
by drivers that are shared between more than one driver.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 3785bc17

MAINTAINERS

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2773,8 +2773,8 @@ FC0011 TUNER DRIVER
	M: Michael Buesch <m@bues.ch>		M: Michael Buesch <m@bues.ch>
	L: linux-media@vger.kernel.org		L: linux-media@vger.kernel.org
	S: Maintained		S: Maintained
	F: drivers/media/common/tuners/fc0011.h		F: drivers/media/tuners/fc0011.h
	F: drivers/media/common/tuners/fc0011.c		F: drivers/media/tuners/fc0011.c

	FANOTIFY		FANOTIFY
	M: Eric Paris <eparis@redhat.com>		M: Eric Paris <eparis@redhat.com>

drivers/media/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -145,7 +145,7 @@ source "drivers/media/rc/Kconfig"
	# Tuner drivers for DVB and V4L		# Tuner drivers for DVB and V4L
	#		#

	source "drivers/media/common/tuners/Kconfig"		source "drivers/media/tuners/Kconfig"

	#		#
	# Video/Radio/Hybrid adapters		# Video/Radio/Hybrid adapters

drivers/media/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
	obj-$(CONFIG_MEDIA_SUPPORT) += media.o		obj-$(CONFIG_MEDIA_SUPPORT) += media.o
	endif		endif

	obj-y += v4l2-core/ common/ rc/ video/		obj-y += v4l2-core/ tuners/ common/ rc/ video/

	obj-$(CONFIG_VIDEO_DEV) += radio/		obj-$(CONFIG_VIDEO_DEV) += radio/
	obj-$(CONFIG_DVB_CORE) += dvb-core/ pci/ dvb-frontends/ usb/		obj-$(CONFIG_DVB_CORE) += dvb-core/ pci/ dvb-frontends/ usb/

drivers/media/common/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	saa7146-objs := saa7146_i2c.o saa7146_core.o		saa7146-objs := saa7146_i2c.o saa7146_core.o
	saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o		saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o

	obj-y += tuners/ b2c2/		obj-y += b2c2/
	obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o		obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
	obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o		obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o

drivers/media/common/b2c2/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,4 +4,4 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o

	ccflags-y += -Idrivers/media/dvb-core/		ccflags-y += -Idrivers/media/dvb-core/
	ccflags-y += -Idrivers/media/dvb-frontends/		ccflags-y += -Idrivers/media/dvb-frontends/
	ccflags-y += -Idrivers/media/common/tuners/		ccflags-y += -Idrivers/media/tuners/