Browse Source

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>
Randy Dunlap 14 years ago
parent
commit
8a226e00ee
2 changed files with 5 additions and 3 deletions
  1. 3 1
      drivers/pci/Kconfig
  2. 2 2
      drivers/pci/Makefile

+ 3 - 1
drivers/pci/Kconfig

@@ -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

+ 2 - 2
drivers/pci/Makefile

@@ -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