Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / drivers / soc / Makefile

diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index e8228c4e5d18d3c9c0997fdfdd792a546cb51d76..69ba6508cf2c17229ef32afcb79137b53f969d09 100644 (file)
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_SOC_CANAAN)      += canaan/
 obj-$(CONFIG_ARCH_DOVE)                += dove/
 obj-$(CONFIG_MACH_DOVE)                += dove/
 obj-y                          += fsl/
+obj-y                          += fujitsu/
 obj-$(CONFIG_ARCH_GEMINI)      += gemini/
 obj-y                          += imx/
 obj-y                          += ixp4xx/
@@ -19,6 +20,7 @@ obj-$(CONFIG_SOC_XWAY)                += lantiq/
 obj-$(CONFIG_LITEX_SOC_CONTROLLER) += litex/
 obj-y                          += mediatek/
 obj-y                          += microchip/
+obj-y                          += pxa/
 obj-y                          += amlogic/
 obj-y                          += qcom/
 obj-y                          += renesas/