diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/acpi.h | 7 | ||||
-rw-r--r-- | include/linux/device.h | 6 | ||||
-rw-r--r-- | include/linux/pm.h | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index ef8483673aa3..f85cbe919e13 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -206,7 +206,10 @@ struct acpi_table_plat_int_src { | |||
206 | u8 eid; | 206 | u8 eid; |
207 | u8 iosapic_vector; | 207 | u8 iosapic_vector; |
208 | u32 global_irq; | 208 | u32 global_irq; |
209 | u32 reserved; | 209 | struct { |
210 | u32 cpei_override_flag:1; | ||
211 | u32 reserved:31; | ||
212 | } plint_flags; | ||
210 | } __attribute__ ((packed)); | 213 | } __attribute__ ((packed)); |
211 | 214 | ||
212 | enum acpi_interrupt_id { | 215 | enum acpi_interrupt_id { |
@@ -475,7 +478,7 @@ struct acpi_prt_list { | |||
475 | struct pci_dev; | 478 | struct pci_dev; |
476 | 479 | ||
477 | int acpi_pci_irq_enable (struct pci_dev *dev); | 480 | int acpi_pci_irq_enable (struct pci_dev *dev); |
478 | void acpi_penalize_isa_irq(int irq); | 481 | void acpi_penalize_isa_irq(int irq, int active); |
479 | 482 | ||
480 | #ifdef CONFIG_ACPI_DEALLOCATE_IRQ | 483 | #ifdef CONFIG_ACPI_DEALLOCATE_IRQ |
481 | void acpi_pci_irq_disable (struct pci_dev *dev); | 484 | void acpi_pci_irq_disable (struct pci_dev *dev); |
diff --git a/include/linux/device.h b/include/linux/device.h index f378c846e6d5..06e5d42f2c7b 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -284,8 +284,10 @@ struct device { | |||
284 | struct device_driver *driver; /* which driver has allocated this | 284 | struct device_driver *driver; /* which driver has allocated this |
285 | device */ | 285 | device */ |
286 | void *driver_data; /* data private to the driver */ | 286 | void *driver_data; /* data private to the driver */ |
287 | void *platform_data; /* Platform specific data (e.g. ACPI, | 287 | void *platform_data; /* Platform specific data, device |
288 | BIOS data relevant to device) */ | 288 | core doesn't touch it */ |
289 | void *firmware_data; /* Firmware specific data (e.g. ACPI, | ||
290 | BIOS data),reserved for device core*/ | ||
289 | struct dev_pm_info power; | 291 | struct dev_pm_info power; |
290 | 292 | ||
291 | u64 *dma_mask; /* dma mask (if dma'able device) */ | 293 | u64 *dma_mask; /* dma mask (if dma'able device) */ |
diff --git a/include/linux/pm.h b/include/linux/pm.h index 14479325e3f3..7aeb208ed713 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
@@ -176,7 +176,7 @@ struct pm_ops { | |||
176 | }; | 176 | }; |
177 | 177 | ||
178 | extern void pm_set_ops(struct pm_ops *); | 178 | extern void pm_set_ops(struct pm_ops *); |
179 | 179 | extern struct pm_ops *pm_ops; | |
180 | extern int pm_suspend(suspend_state_t state); | 180 | extern int pm_suspend(suspend_state_t state); |
181 | 181 | ||
182 | 182 | ||