Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[~andy/linux] / drivers / platform / Makefile

diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile
index b17c16ce54adabc1160474b9aaf3fc2342804308..8a44a4cd6d1efc30789d5da4cc392447695d68ae 100644 (file)
--- a/drivers/platform/Makefile
+++ b/drivers/platform/Makefile
@@ -4,3 +4,4 @@
 
 obj-$(CONFIG_X86)              += x86/
 obj-$(CONFIG_OLPC)             += olpc/
+obj-$(CONFIG_GOLDFISH)         += goldfish/