diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-30 13:38:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-30 13:38:53 +0100 |
| commit | 34f653345018c42cedea89b7f6a4aba3783ebd7b (patch) | |
| tree | 663f490f3e16571516dbcce7a2cb2f2545f79dee /drivers/platform/Makefile | |
| parent | regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | linux-34f653345018c42cedea89b7f6a4aba3783ebd7b.tar.xz linux-34f653345018c42cedea89b7f6a4aba3783ebd7b.zip | |
Merge tag 'v3.13-rc4' into regmap-core
Needed as a subsequent patch is built on some of the fixes.
Linux 3.13-rc4
Diffstat (limited to 'drivers/platform/Makefile')
| -rw-r--r-- | drivers/platform/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile index 8a44a4cd6d1e..3656b7b17b99 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/ |