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 {
         u8                      eid;
         u8                      iosapic_vector;
         u32                     global_irq;
-        u32                     reserved;
+        struct {
+                u32                     cpei_override_flag:1;
+                u32                     reserved:31;
+        }                       plint_flags;
 } __attribute__ ((packed));
 
 enum acpi_interrupt_id {
@@ -475,7 +478,7 @@ struct acpi_prt_list {
 struct pci_dev;
 
 int acpi_pci_irq_enable (struct pci_dev *dev);
-void acpi_penalize_isa_irq(int irq);
+void acpi_penalize_isa_irq(int irq, int active);
 
 #ifdef CONFIG_ACPI_DEALLOCATE_IRQ
 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 {
         struct device_driver *driver;   /* which driver has allocated this
                                            device */
         void            *driver_data;   /* data private to the driver */
-        void            *platform_data; /* Platform specific data (e.g. ACPI,
-                                           BIOS data relevant to device) */
+        void            *platform_data; /* Platform specific data, device
+                                           core doesn't touch it */
+        void            *firmware_data; /* Firmware specific data (e.g. ACPI,
+                                           BIOS data),reserved for device core*/
         struct dev_pm_info      power;
 
         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 {
 };
 
 extern void pm_set_ops(struct pm_ops *);
-
+extern struct pm_ops *pm_ops;
 extern int pm_suspend(suspend_state_t state);