aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorBen Collins <bcollins@bluecherry.net>2010-06-17 13:28:19 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-22 18:58:10 -0400
commit6227157f0cceb092d3e9c6d16ac33f2539a10400 (patch)
treee980120f7dcc375bfaeffdff68ed95c07748ef0d /drivers/staging
parentfaa4fd2a09517b39cc1f5d622453f97a59acfdac (diff)
Staging: solo6x10: Add kconfig/kbuild fairy dust for solo6x10
Signed-off-by: Ben Collins <bcollins@bluecherry.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/Kconfig2
-rw-r--r--drivers/staging/Makefile1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index cdd3ea34831..3de4bca2384 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -151,5 +151,7 @@ source "drivers/staging/msm/Kconfig"
151 151
152source "drivers/staging/easycap/Kconfig" 152source "drivers/staging/easycap/Kconfig"
153 153
154source "drivers/staging/solo6x10/Kconfig"
155
154endif # !STAGING_EXCLUDE_BUILD 156endif # !STAGING_EXCLUDE_BUILD
155endif # STAGING 157endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index beceaff3dfd..b28d8201152 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -56,3 +56,4 @@ obj-$(CONFIG_FB_XGI) += xgifb/
56obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH) += mrst-touchscreen/ 56obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH) += mrst-touchscreen/
57obj-$(CONFIG_MSM_STAGING) += msm/ 57obj-$(CONFIG_MSM_STAGING) += msm/
58obj-$(CONFIG_EASYCAP) += easycap/ 58obj-$(CONFIG_EASYCAP) += easycap/
59obj-$(CONFIG_SOLO6X10) += solo6x10/