Skip to content

Commit

Permalink
PCI: pci-label: Fix build failure when CONFIG_NLS is set to 'm' by al…
Browse files Browse the repository at this point in the history 
…lmodconfig

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>
  • Loading branch information
Randy Dunlap authored and Jesse Barnes committed Apr 12, 2011
1 parent bb3c90f commit 8a226e0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion drivers/pci/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,6 @@ config PCI_IOAPIC
depends on HOTPLUG
default y

select NLS if (DMI || ACPI)
config PCI_LABEL
def_bool y if (DMI || ACPI)
select NLS
4 changes: 2 additions & 2 deletions drivers/pci/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o
# ACPI Related PCI FW Functions
# 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
obj-$(CONFIG_DMI) += pci-label.o
obj-$(CONFIG_PCI_LABEL) += pci-label.o

# Cardbus & CompactPCI use setup-bus
obj-$(CONFIG_HOTPLUG) += setup-bus.o
Expand Down

0 comments on commit 8a226e0

Please sign in to comment.