Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / drivers / base / Makefile

diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 659cde6c2fb9ec9592df7a3a311698d5f7496011..e9eb7382ac3ac26b9c0c0ccae636da25bf4e1fa0 100644 (file)
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -3,11 +3,13 @@
 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 \
+                          dma-mapping.o devres.o \
                           attribute_container.o transport_class.o
 obj-y                  += power/
+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