3 files changed, 11 insertions, 0 deletions

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d5680cd7746a..bf5e0009de75 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -33,6 +33,7 @@
 #endif
 
 #include <linux/list.h>
+#include <linux/mod_devicetable.h>
 
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index af04a555b52c..2ada8ee316b3 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -159,6 +159,12 @@ struct ap_device_id {
 
 #define AP_DEVICE_ID_MATCH_DEVICE_TYPE          0x01
 
+#define ACPI_ID_LEN     9
+
+struct acpi_device_id {
+        __u8 id[ACPI_ID_LEN];
+        kernel_ulong_t driver_data;
+};
 
 #define PNP_ID_LEN      8
 #define PNP_MAX_DEVICES 8
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 {
         int (*set)(struct pnp_dev *dev, struct pnp_resource_table *res);
         int (*disable)(struct pnp_dev *dev);
 
+        /* protocol specific suspend/resume */
+        int (*suspend)(struct pnp_dev *dev, pm_message_t state);
+        int (*resume)(struct pnp_dev *dev);
+
         /* used by pnp layer only (look but don't touch) */
         unsigned char           number;         /* protocol number*/
         struct device           dev;            /* link to driver model */