diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-03-29 12:45:57 -0400 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-04-12 11:39:02 -0400 |
| commit | 8a226e00eeed8db843d4a580013a49ae3559bcd7 (patch) | |
| tree | 334e83e364978d2e38e598cc3adf65ce77aafa31 /drivers/pci/Makefile | |
| parent | bb3c90f0de7b34995b5e35cf5dc97a3d428b3761 (diff) | |
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>
Diffstat (limited to 'drivers/pci/Makefile')
| -rw-r--r-- | drivers/pci/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 98d61c8e984b..c85f744270a5 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile | |||
| @@ -56,10 +56,10 @@ obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o | |||
| 56 | # ACPI Related PCI FW Functions | 56 | # ACPI Related PCI FW Functions |
| 57 | # ACPI _DSM provided firmware instance and string name | 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 | # SMBIOS provided firmware instance and labels | 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 | # Cardbus & CompactPCI use setup-bus | 64 | # Cardbus & CompactPCI use setup-bus |
| 65 | obj-$(CONFIG_HOTPLUG) += setup-bus.o | 65 | obj-$(CONFIG_HOTPLUG) += setup-bus.o |