lkml.org 
[lkml]   [2009]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectDream in staging: 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>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 300b83e..50f9ab0 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -133,11 +133,9 @@ 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/dream/Kconfig"
+
endif # !STAGING_EXCLUDE_BUILD
endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 8d2e1c2..4fa2e07 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -1,7 +1,7 @@
# Makefile for staging directory

# fix for build system bug...
-obj-$(CONFIG_STAGING) += staging.o
+obj-$(CONFIG_STAGING) += staging.o dream/

obj-$(CONFIG_ET131X) += et131x/
obj-$(CONFIG_SLICOSS) += slicoss/
@@ -49,5 +49,3 @@ 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/
diff --git a/drivers/staging/dream/Kconfig b/drivers/staging/dream/Kconfig
new file mode 100644
index 0000000..2e0c972
--- /dev/null
+++ b/drivers/staging/dream/Kconfig
@@ -0,0 +1,4 @@
+source "drivers/staging/dream/smd/Kconfig"
+
+source "drivers/staging/dream/camera/Kconfig"
+
diff --git a/drivers/staging/dream/Makefile b/drivers/staging/dream/Makefile
new file mode 100644
index 0000000..ab76800
--- /dev/null
+++ b/drivers/staging/dream/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_MSM_ADSP) += qdsp5/ smd/
+obj-$(CONFIG_MSM_CAMERA) += camera/
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html


\
 
 \ /
  Last update: 2009-07-20 12:37    [from the cache]
©2003-2011 Jasper Spaans