From 1278cd88cdc98da1b244b3bbf245ab70e6abfdd5 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Sun, 11 Oct 2009 11:05:08 +0200
Subject: [PATCH] --- yaml --- r: 175171 b: refs/heads/master c:
 ff933693a4749a20662dee92f5fe8c8484ec3153 h: refs/heads/master i:   175169:
 133a1fb2fbea37f314d344af485bf6a2c3a6a486   175167:
 21f96396c261903b2968549f5930027006a8bf14 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/staging/Makefile      | 2 +-
 trunk/drivers/staging/dream/Kconfig | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1077c391fc82..6ab9be4b109e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfb97bf833785525eb128cbcee81f686d0239aa4
+refs/heads/master: ff933693a4749a20662dee92f5fe8c8484ec3153
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
index 9852d449a047..3c6135b4126c 100644
--- a/trunk/drivers/staging/Makefile
+++ b/trunk/drivers/staging/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_RTL8192E)		+= rtl8192e/
 obj-$(CONFIG_INPUT_MIMIO)	+= mimio/
 obj-$(CONFIG_TRANZPORT)		+= frontier/
 obj-$(CONFIG_ANDROID)		+= android/
-obj-$(CONFIG_ANDROID)		+= dream/
+obj-$(CONFIG_DREAM)		+= dream/
 obj-$(CONFIG_DST)		+= dst/
 obj-$(CONFIG_POHMELFS)		+= pohmelfs/
 obj-$(CONFIG_B3DFG)		+= b3dfg/
diff --git a/trunk/drivers/staging/dream/Kconfig b/trunk/drivers/staging/dream/Kconfig
index 52bd187de5a7..1268d38ac728 100644
--- a/trunk/drivers/staging/dream/Kconfig
+++ b/trunk/drivers/staging/dream/Kconfig
@@ -1,3 +1,6 @@
+config DREAM
+       tristate "HTC Dream support"
+
 source "drivers/staging/dream/smd/Kconfig"
 
 source "drivers/staging/dream/camera/Kconfig"