diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_bus.h | 2 | ||||
-rw-r--r-- | include/linux/pnp.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 5e3dcf3299bf..a9f73efa01bc 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -365,6 +365,8 @@ acpi_handle acpi_get_child(acpi_handle, acpi_integer); | |||
365 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); | 365 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); |
366 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) | 366 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) |
367 | 367 | ||
368 | int acpi_pm_device_sleep_state(struct device *, int, int *); | ||
369 | |||
368 | #endif /* CONFIG_ACPI */ | 370 | #endif /* CONFIG_ACPI */ |
369 | 371 | ||
370 | #endif /*__ACPI_BUS_H__*/ | 372 | #endif /*__ACPI_BUS_H__*/ |
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 2a1897e6f937..66edb2293184 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
@@ -335,6 +335,10 @@ struct pnp_protocol { | |||
335 | int (*set)(struct pnp_dev *dev, struct pnp_resource_table *res); | 335 | int (*set)(struct pnp_dev *dev, struct pnp_resource_table *res); |
336 | int (*disable)(struct pnp_dev *dev); | 336 | int (*disable)(struct pnp_dev *dev); |
337 | 337 | ||
338 | /* protocol specific suspend/resume */ | ||
339 | int (*suspend)(struct pnp_dev *dev, pm_message_t state); | ||
340 | int (*resume)(struct pnp_dev *dev); | ||
341 | |||
338 | /* used by pnp layer only (look but don't touch) */ | 342 | /* used by pnp layer only (look but don't touch) */ |
339 | unsigned char number; /* protocol number*/ | 343 | unsigned char number; /* protocol number*/ |
340 | struct device dev; /* link to driver model */ | 344 | struct device dev; /* link to driver model */ |