summaryrefslogtreecommitdiffstats
path: root/drivers/platform/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-18 17:24:24 +0000
committerMark Brown <broonie@linaro.org>2013-12-18 17:24:41 +0000
commitd1c8b1bd093cb57860fb6446e096e1c1cda92d4d (patch)
tree9c93ddf1ced6064a7f75a3f8a3691d09e624edb9 /drivers/platform/Makefile
parentd13733f4a24d93c582f22f17b5434cf195b7d505 (diff)
parent1b1ccee1e821e59c2a45c95b007aeb2c9dafd9be (diff)
Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
depend on it. regulator/clk: Fix s2mps11 build This patch fixes a build failure that appeared in v3.13-rc4 due to an RTC/MFD update merged via -mm.
Diffstat (limited to 'drivers/platform/Makefile')
-rw-r--r--drivers/platform/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile
index 8a44a4cd6d1..3656b7b17b9 100644
--- a/drivers/platform/Makefile
+++ b/drivers/platform/Makefile
@@ -5,3 +5,4 @@
obj-$(CONFIG_X86) += x86/
obj-$(CONFIG_OLPC) += olpc/
obj-$(CONFIG_GOLDFISH) += goldfish/
+obj-$(CONFIG_CHROME_PLATFORMS) += chrome/