diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:56:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:56:44 -0400 |
| commit | 99759619b27662d1290901228d77a293e6e83200 (patch) | |
| tree | e76841fa3f59ebfc3975ff40bbc14363d0fdc5d3 /drivers/pci/Makefile | |
| parent | b061c59c27e0385e53c961d9fbd18c1c078d9823 (diff) | |
| parent | 65d8defe2e13fbebd74f96d2b5ca9aad435e6648 (diff) | |
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: label: remove #include of ACPI header to avoid warnings
PCI: label: Fix compilation error when CONFIG_ACPI is unset
PCI: pre-allocate additional resources to devices only after successful allocation of essential resources.
PCI: introduce reset_resource()
PCI: data structure agnostic free list function
PCI: refactor io size calculation code
PCI: do not create quirk I/O regions below PCIBIOS_MIN_IO for ICH
PCI hotplug: acpiphp: set current_state to D0 in register_slot
PCI: Export ACPI _DSM provided firmware instance number and string name to sysfs
PCI: add more checking to ICH region quirks
PCI: aer-inject: Override PCIe AER Mask Registers
PCI: fix tlan build when CONFIG_PCI is not enabled
PCI: remove quirk for pre-production systems
PCI: Avoid potential NULL pointer dereference in pci_scan_bridge
PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
PCI: sysfs: Fix failure path for addition of "vpd" attribute
Diffstat (limited to 'drivers/pci/Makefile')
| -rw-r--r-- | drivers/pci/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 77cf813ba264..98d61c8e984b 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile | |||
| @@ -54,8 +54,9 @@ obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o | |||
| 54 | 54 | ||
| 55 | # | 55 | # |
| 56 | # ACPI Related PCI FW Functions | 56 | # ACPI Related PCI FW Functions |
| 57 | # ACPI _DSM provided firmware instance and string name | ||
| 57 | # | 58 | # |
| 58 | obj-$(CONFIG_ACPI) += pci-acpi.o | 59 | obj-$(CONFIG_ACPI) += pci-acpi.o pci-label.o |
| 59 | 60 | ||
| 60 | # SMBIOS provided firmware instance and labels | 61 | # SMBIOS provided firmware instance and labels |
| 61 | obj-$(CONFIG_DMI) += pci-label.o | 62 | obj-$(CONFIG_DMI) += pci-label.o |