diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-26 17:35:05 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-26 17:35:05 -0700 |
| commit | fb455792d91469fe556b68f1baa9ff5493432be8 (patch) | |
| tree | 12abb06786d7e09a3d43fc3d852b9848f3805060 /include/linux/pci.h | |
| parent | 14b5cb37cc6172a54ce920c61784f44422ae306d (diff) | |
| parent | a2766602ac6885f9514abd97821984cd152cdad3 (diff) | |
| download | blackbird-op-linux-fb455792d91469fe556b68f1baa9ff5493432be8.tar.gz blackbird-op-linux-fb455792d91469fe556b68f1baa9ff5493432be8.zip | |
Merge branch 'pci/acpi-scan2' into next
* pci/acpi-scan2:
ACPI / scan: Drop acpi_bus_add() and use acpi_bus_scan() instead
ACPI: update ej_event interface to take acpi_device
ACPI / scan: Add second pass to acpi_bus_trim()
ACPI / scan: Change the implementation of acpi_bus_trim()
ACPI / scan: Drop the second argument of acpi_bus_trim()
ACPI / scan: Drop the second argument of acpi_device_unregister()
ACPI: Remove the ops field from struct acpi_device
ACPI: remove unused acpi_op_bind and acpi_op_unbind
ACPI / scan: Fix check of device_attach() return value.
Diffstat (limited to 'include/linux/pci.h')
0 files changed, 0 insertions, 0 deletions
