Pull d-states into release branch

Conflicts:

	drivers/acpi/sleep/main.c

Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
Len Brown 2007-07-25 01:36:31 -04:00
commit cb3e0c107b
8 changed files with 181 additions and 42 deletions

View file

@ -365,6 +365,8 @@ acpi_handle acpi_get_child(acpi_handle, acpi_integer);
acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int);
#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle))
int acpi_pm_device_sleep_state(struct device *, int, int *);
#endif /* CONFIG_ACPI */
#endif /*__ACPI_BUS_H__*/