From e1e08739c6f759f8e84abfe71762cbf51097ba54 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 1 May 2010 10:59:23 -0700 Subject: [PATCH] --- yaml --- r: 197164 b: refs/heads/master c: 11d91a4456bbc63d2b79ea5f16ffc31ae53cdf79 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 39a3fbc7c5ed..be4dec75b7ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d42bffb8990ca9e74cc1ba625ce23dda2bd8c8c5 +refs/heads/master: 11d91a4456bbc63d2b79ea5f16ffc31ae53cdf79 diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile index 23e353a411d7..e825647afda7 100644 --- a/trunk/drivers/staging/Makefile +++ b/trunk/drivers/staging/Makefile @@ -50,6 +50,7 @@ obj-$(CONFIG_PCMCIA_WAVELAN) += wavelan/ obj-$(CONFIG_PCMCIA_NETWAVE) += netwave/ obj-$(CONFIG_FB_SM7XX) += sm7xx/ obj-$(CONFIG_DT3155) += dt3155/ +obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/ obj-$(CONFIG_CRYSTALHD) += crystalhd/ obj-$(CONFIG_CXT1E1) += cxt1e1/ obj-$(CONFIG_TI_ST) += ti-st/