From a4f97450e7aa8b7a56ba2216773f2d60e105c7d4 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 8 Aug 2009 14:27:02 +0200 Subject: [PATCH] --- yaml --- r: 162296 b: refs/heads/master c: 347a799cef17e66bd532fca4e55a5f5a2f9ff36c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/Kconfig | 6 ++---- trunk/drivers/staging/Makefile | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ba42845775b8..2b24217ea2d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d62691b609cc4e66e15c8e5b2261ddb6785b7ca +refs/heads/master: 347a799cef17e66bd532fca4e55a5f5a2f9ff36c diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig index 34aa21e1fb38..aec18bcd6e5b 100644 --- a/trunk/drivers/staging/Kconfig +++ b/trunk/drivers/staging/Kconfig @@ -99,6 +99,8 @@ source "drivers/staging/epl/Kconfig" source "drivers/staging/android/Kconfig" +source "drivers/staging/dream/Kconfig" + source "drivers/staging/dst/Kconfig" source "drivers/staging/pohmelfs/Kconfig" @@ -131,10 +133,6 @@ source "drivers/staging/cpc-usb/Kconfig" source "drivers/staging/pata_rdc/Kconfig" -source "drivers/staging/dream/smd/Kconfig" - -source "drivers/staging/dream/camera/Kconfig" - source "drivers/staging/udlfb/Kconfig" source "drivers/staging/hv/Kconfig" diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile index bc84a0e0a46e..f4f7666bc4e6 100644 --- a/trunk/drivers/staging/Makefile +++ b/trunk/drivers/staging/Makefile @@ -32,6 +32,7 @@ obj-$(CONFIG_INPUT_MIMIO) += mimio/ obj-$(CONFIG_TRANZPORT) += frontier/ obj-$(CONFIG_EPL) += epl/ obj-$(CONFIG_ANDROID) += android/ +obj-$(CONFIG_ANDROID) += dream/ obj-$(CONFIG_DST) += dst/ obj-$(CONFIG_POHMELFS) += pohmelfs/ obj-$(CONFIG_STLC45XX) += stlc45xx/ @@ -48,6 +49,4 @@ obj-$(CONFIG_VT6656) += vt6656/ obj-$(CONFIG_USB_CPC) += cpc-usb/ obj-$(CONFIG_RDC_17F3101X) += pata_rdc/ obj-$(CONFIG_FB_UDL) += udlfb/ -obj-$(CONFIG_MSM_ADSP) += dream/qdsp5/ dream/smd/ -obj-$(CONFIG_MSM_CAMERA) += dream/camera/ obj-$(CONFIG_HYPERV) += hv/