aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/olpc_dcon/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-04 13:52:35 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-04 13:52:35 -0700
commit53c43c5ca13328ac8f415aa2251791b441a12b51 (patch)
treece6dbd7c97b5cf8755d94e03fcf2a63c719bfe1e /drivers/staging/olpc_dcon/Makefile
parentstaging/rdma/hfi1: select CRC32 (diff)
downloadlinux-dev-53c43c5ca13328ac8f415aa2251791b441a12b51.tar.xz
linux-dev-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/olpc_dcon/Makefile')
-rw-r--r--drivers/staging/olpc_dcon/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/olpc_dcon/Makefile b/drivers/staging/olpc_dcon/Makefile
new file mode 100644
index 000000000000..36c7e67fec20
--- /dev/null
+++ b/drivers/staging/olpc_dcon/Makefile
@@ -0,0 +1,6 @@
+olpc-dcon-objs += olpc_dcon.o
+olpc-dcon-$(CONFIG_FB_OLPC_DCON_1) += olpc_dcon_xo_1.o
+olpc-dcon-$(CONFIG_FB_OLPC_DCON_1_5) += olpc_dcon_xo_1_5.o
+obj-$(CONFIG_FB_OLPC_DCON) += olpc-dcon.o
+
+