Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8a226e00eeed8db843d4a580013a49ae3559bcd7

Authored by Randy Dunlap
Committed by Jesse Barnes
1 parent bb3c90f0de

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

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>

Showing 2 changed files with 5 additions and 3 deletions Side-by-side Diff

... ... @@ -88,5 +88,7 @@
88 88 depends on HOTPLUG
89 89 default y
90 90  
91   -select NLS if (DMI || ACPI)
  91 +config PCI_LABEL
  92 + def_bool y if (DMI || ACPI)
  93 + select NLS
drivers/pci/Makefile
Diff comments   View file @ 8a226e0
... ... @@ -56,10 +56,10 @@
56 56 # ACPI Related PCI FW Functions
57 57 # ACPI _DSM provided firmware instance and string name
58 58 #
59   -obj-$(CONFIG_ACPI) += pci-acpi.o pci-label.o
  59 +obj-$(CONFIG_ACPI) += pci-acpi.o
60 60  
61 61 # SMBIOS provided firmware instance and labels
62   -obj-$(CONFIG_DMI) += pci-label.o
  62 +obj-$(CONFIG_PCI_LABEL) += pci-label.o
63 63  
64 64 # Cardbus & CompactPCI use setup-bus
65 65 obj-$(CONFIG_HOTPLUG) += setup-bus.o