diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 19:34:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 19:34:33 +0200 |
| commit | 530a70617cb6325bd7781e7a993d732d6d37915a (patch) | |
| tree | 8226dccfa0931e33d15a6ac697b2eeb0a0ee67ff /drivers/staging/Makefile | |
| parent | 26e9c85b48b4e3a2301c049213de3b5456c6b0a4 (diff) | |
| parent | 2bbadafbe4eacab57aa7bc8e50287c1366303807 (diff) | |
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/Makefile')
| -rw-r--r-- | drivers/staging/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 29a1672820e6..6952aaf3114b 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -40,3 +40,4 @@ obj-$(CONFIG_WILC1000) += wilc1000/ obj-$(CONFIG_MOST) += most/ obj-$(CONFIG_ISDN_I4L) += i4l/ obj-$(CONFIG_KS7010) += ks7010/ +obj-$(CONFIG_GREYBUS) += greybus/ |