Commit 97ddec65 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: pci-label: Fix build failure when CONFIG_NLS is set to 'm' by allmodconfig
parents 9d914b3e 8a226e00
...@@ -88,4 +88,6 @@ config PCI_IOAPIC ...@@ -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
...@@ -56,10 +56,10 @@ obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment