diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-04 13:52:35 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-04 13:52:35 -0700 |
commit | 53c43c5ca13328ac8f415aa2251791b441a12b51 (patch) | |
tree | ce6dbd7c97b5cf8755d94e03fcf2a63c719bfe1e /drivers/staging/Makefile | |
parent | staging/rdma/hfi1: select CRC32 (diff) | |
download | linux-53c43c5ca13328ac8f415aa2251791b441a12b51.tar.gz linux-53c43c5ca13328ac8f415aa2251791b441a12b51.tar.bz2 linux-53c43c5ca13328ac8f415aa2251791b441a12b51.zip |
Revert "Staging: olpc_dcon: Remove obsolete driver"
This reverts commit 82ef33af9dd30075adbd9f3dd161b606b8ba88ac. It turns
out these machines are still out there, and the original patch broke
them. So revert it, adding back the driver, so people's machines still
work properly.
Reported-by: James Cameron <quozl@laptop.org>
Cc: Shraddha Barke <shraddha.6596@gmail.com>
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 7d6448d20464..a954242b0f2c 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -4,6 +4,7 @@ obj-y += media/ obj-$(CONFIG_SLICOSS) += slicoss/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_COMEDI) += comedi/ +obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ obj-$(CONFIG_RTL8192U) += rtl8192u/ obj-$(CONFIG_RTL8192E) += rtl8192e/ obj-$(CONFIG_R8712U) += rtl8712/ |