diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-14 01:55:01 +0300 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-14 01:55:01 +0300 |
commit | be6bfc29bc759670fb3a2519325c4ab2edf259c9 (patch) | |
tree | e4ffd461d48ecd984b6f250834dcccf099b1f6b9 /drivers/soc/Makefile | |
parent | a61674bdfc7c2bf909c4010699607b62b69b7bec (diff) | |
parent | 44451d4d8f0e35153b3e7e3d40e198f2cf9ac36a (diff) | |
download | linux-be6bfc29bc759670fb3a2519325c4ab2edf259c9.tar.xz |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include moving QE code out of arch/powerpc (to be shared with
arm), device tree updates, and minor fixes."
Diffstat (limited to 'drivers/soc/Makefile')
-rw-r--r-- | drivers/soc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index f2ba2e932ae1..9536b804424a 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_SOC_BRCMSTB) += brcmstb/ obj-$(CONFIG_MACH_DOVE) += dove/ +obj-y += fsl/ obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ obj-$(CONFIG_ARCH_QCOM) += qcom/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ |