Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / drivers / base / Makefile

diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index b539e5e75b5690116f868c9ea06283c758f6f7a7..e9eb7382ac3ac26b9c0c0ccae636da25bf4e1fa0 100644 (file)
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -3,12 +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