Merge branch 'video' into release

Conflicts:
	Documentation/kernel-parameters.txt

Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
Len Brown 2008-11-11 21:15:50 -05:00
commit f398778aa3
16 changed files with 469 additions and 84 deletions

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);