From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:26:58 +0000 (+0800)
Subject: Revert "disable staging/dream"
X-Git-Tag: firefly_0821_release~9976
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dcc7c493d936797392af74dd1cb4f823ce81ec0f;p=firefly-linux-kernel-4.4.55.git

Revert "disable staging/dream"

This reverts commit 1d69bc989dc640d17e966818936e30698f243790.
---

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 73c026ed8e48..8964792e5153 100755
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -26,7 +26,7 @@ obj-$(CONFIG_RTL8192E)		+= rtl8192e/
 obj-$(CONFIG_INPUT_MIMIO)	+= mimio/
 obj-$(CONFIG_TRANZPORT)		+= frontier/
 obj-$(CONFIG_ANDROID)		+= android/
-obj-$(CONFIG_STAGING_DREAM)	+= dream/
+obj-$(CONFIG_ANDROID)		+= dream/
 obj-$(CONFIG_DST)		+= dst/
 obj-$(CONFIG_POHMELFS)		+= pohmelfs/
 obj-$(CONFIG_B3DFG)		+= b3dfg/