summaryrefslogtreecommitdiff
path: root/drivers/core/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-08-06 19:56:03 -0400
committerTom Rini <trini@konsulko.com>2015-08-06 19:56:03 -0400
commitae27120c31d58b8bb694d9155bcffdcfae8552a6 (patch)
tree8fcd4823406dc3adfb82174314198e9396c24feb /drivers/core/Makefile
parentf05fa6781ae1122f348e66b5b26acbfe552f6602 (diff)
parentfac971b2b5efbdb6ed2d12ebdbf7e029c5ed30e8 (diff)
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/core/Makefile')
-rw-r--r--drivers/core/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/core/Makefile b/drivers/core/Makefile
index 5c2ead870b..ccc2fd4e21 100644
--- 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