leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: pci-label: Fix build failure when CONFIG_NLS is set to 'm' by allmodconfig

Browse Source 
Create a kconfig option symbol for PCI_LABEL and enable it
when DMI || ACPI are enabled.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Randy Dunlap 2011-03-29 09:45:57 -07:00 committed by Jesse Barnes
parent bb3c90f0de
commit 8a226e00ee
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/Kconfig
View File

@ -88,4 +88,6 @@ config PCI_IOAPIC
depends on HOTPLUG depends on HOTPLUG
default y default y
select NLS if (DMI || ACPI) config PCI_LABEL
def_bool y if (DMI || ACPI)
select NLS

4
drivers/pci/Makefile
View File

@ -56,10 +56,10 @@ obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o
# ACPI Related PCI FW Functions # ACPI Related PCI FW Functions
# ACPI _DSM provided firmware instance and string name # ACPI _DSM provided firmware instance and string name
# #
obj-$(CONFIG_ACPI) += pci-acpi.o pci-label.o obj-$(CONFIG_ACPI) += pci-acpi.o
# SMBIOS provided firmware instance and labels # SMBIOS provided firmware instance and labels
obj-$(CONFIG_DMI) += pci-label.o obj-$(CONFIG_PCI_LABEL) += pci-label.o
# Cardbus & CompactPCI use setup-bus # Cardbus & CompactPCI use setup-bus
obj-$(CONFIG_HOTPLUG) += setup-bus.o obj-$(CONFIG_HOTPLUG) += setup-bus.o