From 0a51e2dc0699a86058843ca3b29b1fadcb736e4b Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 4 Nov 2011 06:13:14 -0300
Subject: [PATCH] --- yaml --- r: 285150 b: refs/heads/master c:
 33cdf5b0e75142096d79cbe3cb7c3dc797499562 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/media/solo6x10/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6cbae58f566a..5c19e3864122 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3c7d453a00b7dadc2a7435f68b012371ccc3a3e
+refs/heads/master: 33cdf5b0e75142096d79cbe3cb7c3dc797499562
diff --git a/trunk/drivers/staging/media/solo6x10/Makefile b/trunk/drivers/staging/media/solo6x10/Makefile
index 72816cf16704..337e38c3a0f0 100644
--- a/trunk/drivers/staging/media/solo6x10/Makefile
+++ b/trunk/drivers/staging/media/solo6x10/Makefile
@@ -1,3 +1,3 @@
 solo6x10-y := core.o i2c.o p2m.o v4l2.o tw28.o gpio.o disp.o enc.o v4l2-enc.o g723.o
 
-obj-$(CONFIG_SOLO6X10) := solo6x10.o
+obj-$(CONFIG_SOLO6X10) += solo6x10.o