From: Mauro Carvalho Chehab Date: Wed, 2 Nov 2011 11:15:04 +0000 (-0200) Subject: staging/Makefile: Don't compile a media driver there X-Git-Tag: next-20111103~45^2^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bd90649834a322ff70925db9ac37bf7a461add52;p=karo-tx-linux.git 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 --- diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index cf92bc1ea849..c1a60ef31596 100644 --- 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/