Merge branch 'u-boot/master' into 'u-boot-arm/master'

[u-boot] / drivers / mtd / spi / Makefile

diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile
index 15789a07d8f674786e201581784a7ffb9c37bfed..ed46648aa37a3b45795ff3eb5e0678fad2933fd8 100644 (file)
--- a/drivers/mtd/spi/Makefile
+++ b/drivers/mtd/spi/Makefile
@@ -15,8 +15,9 @@ endif
 #ifndef CONFIG_DM_SPI
 obj-$(CONFIG_SPI_FLASH) += sf_probe.o
 #endif
+obj-$(CONFIG_SF_DATAFLASH) += sf_dataflash.o
 obj-$(CONFIG_CMD_SF) += sf.o
 obj-$(CONFIG_SPI_FLASH) += sf_ops.o sf_params.o
-obj-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.o
+obj-$(CONFIG_SPI_FLASH_MTD) += sf_mtd.o
 obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o
 obj-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o