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

[firefly-linux-kernel-4.4.55.git] / drivers / memory / Makefile

diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index c32d31981be314518d16c8933177937e97841545..6b6548124473350a453b8982e341e4bb27264458 100644 (file)
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -8,8 +8,10 @@ endif
 obj-$(CONFIG_ATMEL_SDRAMC)     += atmel-sdramc.o
 obj-$(CONFIG_TI_AEMIF)         += ti-aemif.o
 obj-$(CONFIG_TI_EMIF)          += emif.o
+obj-$(CONFIG_OMAP_GPMC)                += omap-gpmc.o
 obj-$(CONFIG_FSL_CORENET_CF)   += fsl-corenet-cf.o
 obj-$(CONFIG_FSL_IFC)          += fsl_ifc.o
 obj-$(CONFIG_MVEBU_DEVBUS)     += mvebu-devbus.o
 obj-$(CONFIG_TEGRA20_MC)       += tegra20-mc.o
-obj-$(CONFIG_TEGRA30_MC)       += tegra30-mc.o
+
+obj-$(CONFIG_TEGRA_MC)         += tegra/