staging/Makefile: Don't compile a media driver there

Otherwise, with driver as "y", compilation will break:

drivers/staging/media/as102/built-in.o: In function `as10x_cmd_get_demod_stats':
/home/v4l/work_trees/linux-next/drivers/staging/media/as102/as10x_cmd.c:306: multiple definition of `as10x_cmd_get_demod_stats'
drivers/staging/media/built-in.o:/home/v4l/work_trees/linux-next/drivers/staging/media/as102/as10x_cmd.c:306: first defined here
drivers/staging/media/as102/built-in.o:(.data+0x88): multiple definition of `as102_st_fw1'
drivers/staging/media/built-in.o:(.data+0x88): first defined here

as the same driver is already at staging/media/Makefile.

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

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index cf92bc1ea84944b389d5375369607f7b0ac220a5..c1a60ef315967cc378402457c2db59393d046025 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -58,4 +58,3 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)  += ste_rmi4/
 obj-$(CONFIG_DRM_PSB)          += gma500/
 obj-$(CONFIG_INTEL_MEI)                += mei/
 obj-$(CONFIG_MFD_NVEC)         += nvec/
-obj-$(CONFIG_DVB_AS102)                += media/as102/