Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

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

diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 66d9c4643fc1d0857cbaac240a2cc7a9f6dbfff6..e99471d3232bb6d3fc70a33263986e2908d8751d 100644 (file)
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -7,6 +7,8 @@ obj-y                   := core.o sys.o bus.o dd.o \
 obj-y                  += power/
 obj-$(CONFIG_FW_LOADER)        += firmware_class.o
 obj-$(CONFIG_NUMA)     += node.o
+obj-$(CONFIG_MEMORY_HOTPLUG) += memory.o
+obj-$(CONFIG_SMP)      += topology.o
 
 ifeq ($(CONFIG_DEBUG_DRIVER),y)
 EXTRA_CFLAGS += -DDEBUG