Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / staging / olpc_dcon / Makefile

diff --git a/drivers/staging/olpc_dcon/Makefile b/drivers/staging/olpc_dcon/Makefile
new file mode 100644 (file)
index 0000000..cd8f289
--- /dev/null
+++ b/drivers/staging/olpc_dcon/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_FB_OLPC_DCON)     += olpc_dcon.o