From be304970850806abea880da95fbfb743a4d9f87d Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 23 Sep 2011 09:30:01 -0300 Subject: [media] move tm6000 to drivers/media/video The serious bugs got fixed already. Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/staging/Makefile') diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index f3c5e33..d44d25e 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -7,7 +7,6 @@ obj-$(CONFIG_ET131X) += et131x/ obj-$(CONFIG_SLICOSS) += slicoss/ obj-$(CONFIG_VIDEO_GO7007) += go7007/ obj-$(CONFIG_VIDEO_CX25821) += cx25821/ -obj-$(CONFIG_VIDEO_TM6000) += tm6000/ obj-$(CONFIG_DVB_CXD2099) += cxd2099/ obj-$(CONFIG_LIRC_STAGING) += lirc/ obj-$(CONFIG_USBIP_CORE) += usbip/ -- cgit v1.1 From cff4fa8415a3224a5abdd2b1dd7f431e4ea49366 Mon Sep 17 00:00:00 2001 From: "Igor M. Liplianin" Date: Fri, 23 Sep 2011 11:17:41 -0300 Subject: [media] altera-stapl: it is time to move out from staging [mchehab@redhat.com: Fix a merge conflict] Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/staging/Makefile') diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index d44d25e..a2e77cf 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -59,7 +59,6 @@ obj-$(CONFIG_BCM_WIMAX) += bcm/ obj-$(CONFIG_FT1000) += ft1000/ obj-$(CONFIG_SND_INTEL_SST) += intel_sst/ obj-$(CONFIG_SPEAKUP) += speakup/ -obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217) += cptm1217/ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/ obj-$(CONFIG_DRM_PSB) += gma500/ -- cgit v1.1