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 d44d25ed6cf1..a2e77cf1dcb8 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.2.3