Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

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

diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index f12898d53078e9d4fbe21123e4283c8044387cc2..b539e5e75b5690116f868c9ea06283c758f6f7a7 100644 (file)
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -5,9 +5,12 @@ obj-y                  := core.o sys.o bus.o dd.o \
                           cpu.o firmware.o init.o map.o dmapool.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_SMP)      += topology.o
+obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o
 
 ifeq ($(CONFIG_DEBUG_DRIVER),y)
 EXTRA_CFLAGS += -DDEBUG