mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge back earlier acpi-pnp material.

Browse Source 
Conflicts:
	drivers/pnp/pnpacpi/core.c
This commit is contained in:
Rafael J. Wysocki
2014-07-30 00:24:40 +02:00
parent b6328a07bd e70dba6020
commit feb41bb1ca
3 changed files with 28 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/acpi/acpi_bus.h
View File

@@ -487,6 +487,8 @@ struct acpi_bus_type {
};
int register_acpi_bus_type(struct acpi_bus_type *);
int unregister_acpi_bus_type(struct acpi_bus_type *);
int acpi_bind_one(struct device *dev, struct acpi_device *adev);
int acpi_unbind_one(struct device *dev);
struct acpi_pci_root {
struct acpi_device * device;