Pull auto-load-modules into release branch

1 files changed, 6 insertions, 0 deletions

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