diff options
author | Len Brown <len.brown@intel.com> | 2007-07-25 05:36:53 (GMT) |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-07-25 05:36:53 (GMT) |
commit | 323ef30af3a0da47cc761b04b262d98d0fe79126 (patch) | |
tree | 37636b25acc557969aee51f1fe3e3cbc7a9760ea /include/linux | |
parent | cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4 (diff) | |
parent | 1ba90e3a87c46500623afdc3898573e4a5ebb21b (diff) | |
download | linux-fsl-qoriq-323ef30af3a0da47cc761b04b262d98d0fe79126.tar.xz |
Pull auto-load-modules into release branch
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/acpi.h | 1 | ||||
-rw-r--r-- | include/linux/mod_devicetable.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d5680cd..bf5e000 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 af04a55..2ada8ee 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 |