Staging: Dream: separate Kconfig/Makefile into subdirectory

Separate Kconfig/Makefile glue from dream into subdirectory. I plan to
add few more drivers, and changing staging/Makefile each time sounds
like inviting conflicts.

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 34aa21e1fb3817fc9d7776d9faff548d377aa61e..aec18bcd6e5b681982de61de6b37f688102bfd97 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/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/drivers/staging/Makefile b/drivers/staging/Makefile
index bc84a0e0a46e5a2ad3c2e3b0084919b7ee0fc3bc..f4f7666bc4e6cef81870731c898d986f85cf535e 100644 (file)
--- a/drivers/staging/Makefile
+++ b/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/