lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'video' into release

Browse Source 
Conflicts:
	Documentation/kernel-parameters.txt

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2008-11-11 21:15:50 -05:00
parent 9b5a56ddfd 2dba1b5d87
commit f398778aa3
16 changed files with 469 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/acpi/acpi_bus.h
View File

@@ -380,6 +380,8 @@ struct acpi_bus_type {
int register_acpi_bus_type(struct acpi_bus_type *);
int unregister_acpi_bus_type(struct acpi_bus_type *);
struct device *acpi_get_physical_device(acpi_handle);
struct device *acpi_get_physical_pci_device(acpi_handle);
/* helper */
acpi_handle acpi_get_child(acpi_handle, acpi_integer);
acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int);