diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2017-07-23 19:53:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2017-07-23 19:53:30 -0700 |
| commit | a29e24907208a7e05e9bd3f990d3fc5ea49667de (patch) | |
| tree | 9ccf691398e230764dd09ed83211376a0e77e4a9 /drivers/staging/Makefile | |
| parent | Staging: vt6655: Fixing coding style warnings (diff) | |
| parent | Linux 4.13-rc2 (diff) | |
| download | linux-a29e24907208a7e05e9bd3f990d3fc5ea49667de.tar.gz linux-a29e24907208a7e05e9bd3f990d3fc5ea49667de.tar.bz2 linux-a29e24907208a7e05e9bd3f990d3fc5ea49667de.zip | |
Merge 4.13-rc2 into staging-next
This resolves a merge issue and gets the vmbox drm driver into this
branch to be able to start taking fixes for it...
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 998f6441e3aa..993ed0c1556c 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -44,4 +44,5 @@ obj-$(CONFIG_KS7010) += ks7010/ obj-$(CONFIG_GREYBUS) += greybus/ obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/ obj-$(CONFIG_CRYPTO_DEV_CCREE) += ccree/ +obj-$(CONFIG_DRM_VBOXVIDEO) += vboxvideo/ obj-$(CONFIG_PI433) += pi433/ |