commit 8a226e00eeed8db843d4a580013a49ae3559bcd7
author Randy Dunlap <randy.dunlap@oracle.com> Tue Mar 29 09:45:57 2011 -0700
committer Jesse Barnes <jbarnes@virtuousgeek.org> Tue Apr 12 08:39:02 2011 -0700
tree 334e83e364978d2e38e598cc3adf65ce77aafa31
parent bb3c90f0de7b34995b5e35cf5dc97a3d428b3761

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>

drivers/pci/Makefile

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 98d61c8..c85f744 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -56,10 +56,10 @@
 # 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