Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / base / Makefile

diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index e99471d3232bb6d3fc70a33263986e2908d8751d..b39ea3f59c9b77edc9ec636383bcc3f3f3225f4e 100644 (file)
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -2,13 +2,16 @@
 
 obj-y                  := core.o sys.o bus.o dd.o \
                           driver.o class.o platform.o \
-                          cpu.o firmware.o init.o map.o dmapool.o \
+                          cpu.o firmware.o init.o map.o devres.o \
                           attribute_container.o transport_class.o
 obj-y                  += power/
+obj-$(CONFIG_HAS_DMA)  += dma-mapping.o dmapool.o
+obj-$(CONFIG_ISA)      += isa.o
 obj-$(CONFIG_FW_LOADER)        += firmware_class.o
 obj-$(CONFIG_NUMA)     += node.o
-obj-$(CONFIG_MEMORY_HOTPLUG) += memory.o
+obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
 obj-$(CONFIG_SMP)      += topology.o
+obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o
 
 ifeq ($(CONFIG_DEBUG_DRIVER),y)
 EXTRA_CFLAGS += -DDEBUG