diff options
author | Igor M. Liplianin <liplianin@netup.ru> | 2011-09-23 11:17:41 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-23 15:00:57 -0300 |
commit | cff4fa8415a3224a5abdd2b1dd7f431e4ea49366 (patch) | |
tree | e27e0d5998d3e47a8fe90380b3c166993b121239 /drivers/staging/Makefile | |
parent | 08347cdd2d745cdcd82e8c4aa2804923df298f33 (diff) | |
download | linux-stable-cff4fa8415a3224a5abdd2b1dd7f431e4ea49366.tar.gz linux-stable-cff4fa8415a3224a5abdd2b1dd7f431e4ea49366.tar.bz2 linux-stable-cff4fa8415a3224a5abdd2b1dd7f431e4ea49366.zip |
[media] altera-stapl: it is time to move out from staging
[mchehab@redhat.com: Fix a merge conflict]
Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r-- | drivers/staging/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
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/ |