git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
[pandora-kernel.git]
/
drivers
/
pci
/
Makefile
diff --git
a/drivers/pci/Makefile
b/drivers/pci/Makefile
index
0b51857
..
dc1aa09
100644
(file)
--- a/
drivers/pci/Makefile
+++ b/
drivers/pci/Makefile
@@
-55,6
+55,9
@@
obj-$(CONFIG_MICROBLAZE) += setup-bus.o
#
obj-$(CONFIG_ACPI) += pci-acpi.o
+# SMBIOS provided firmware instance and labels
+obj-$(CONFIG_DMI) += pci-label.o
+
# Cardbus & CompactPCI use setup-bus
obj-$(CONFIG_HOTPLUG) += setup-bus.o