Merge branch 'upstream'

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

diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 18613857298036c5fd68a3e00bee426bfcf1cb51..98e395f4bb29e8a37233f737f72fa5564208843d 100644 (file)
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -1,7 +1,9 @@
 #
 # Makefile for the linux kernel.
 #
-obj-$(CONFIG_EDD)              += edd.o
+obj-$(CONFIG_DMI)              += dmi_scan.o
+obj-$(CONFIG_EDD)              += edd.o
 obj-$(CONFIG_EFI_VARS)         += efivars.o
 obj-$(CONFIG_EFI_PCDP)         += pcdp.o
 obj-$(CONFIG_DELL_RBU)          += dell_rbu.o
+obj-$(CONFIG_DCDBAS)           += dcdbas.o