tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 97ddec65 9d914b3e

+5 -3
unified split
+3 -1
drivers/pci/Kconfig
··· 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
+2 -2
drivers/pci/Makefile
··· 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