summaryrefslogtreecommitdiff
path: root/drivers/staging/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-19 20:34:33 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-19 20:34:33 +0300
commit530a70617cb6325bd7781e7a993d732d6d37915a (patch)
tree8226dccfa0931e33d15a6ac697b2eeb0a0ee67ff /drivers/staging/Kconfig
parent26e9c85b48b4e3a2301c049213de3b5456c6b0a4 (diff)
parent2bbadafbe4eacab57aa7bc8e50287c1366303807 (diff)
downloadlinux-530a70617cb6325bd7781e7a993d732d6d37915a.tar.xz
Merge branch 'greybus' into staging-testing
This merges the greybus branch into staging-testing. It contains the drivers/staging/greybus/ subsystem and related drivers and has passed the 0-day bot tests so no builds should break. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/Kconfig')
-rw-r--r--drivers/staging/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 5ebaf0028a10..9c0339c53fe0 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -102,4 +102,6 @@ source "drivers/staging/i4l/Kconfig"
source "drivers/staging/ks7010/Kconfig"
+source "drivers/staging/greybus/Kconfig"
+
endif # STAGING