Merge git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / drivers / core / Makefile

diff --git a/drivers/core/Makefile b/drivers/core/Makefile
index 5c2ead870b00412bf0ebc5532a21b4ebdfd82974..ccc2fd4e21ae1f9ab53fd3c181e06007f5e7d8c5 100644 (file)
--- a/drivers/core/Makefile
+++ b/drivers/core/Makefile
@@ -5,10 +5,11 @@
 #
 
 obj-y  += device.o lists.o root.o uclass.o util.o
+obj-$(CONFIG_DEVRES) += devres.o
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_OF_CONTROL) += simple-bus.o
 endif
 obj-$(CONFIG_DM_DEVICE_REMOVE) += device-remove.o
 obj-$(CONFIG_DM)       += dump.o
-obj-$(CONFIG_OF_CONTROL)       += regmap.o
-obj-$(CONFIG_OF_CONTROL)       += syscon-uclass.o
+obj-$(CONFIG_REGMAP)   += regmap.o
+obj-$(CONFIG_SYSCON)   += syscon-uclass.o