Pull auto-load-modules into release branch

2007-07-25 01:36:53 -04:00
parent cb3e0c107b 1ba90e3a87
commit 323ef30af3
33 changed files with 336 additions and 106 deletions
@@ -33,6 +33,7 @@
 #endif

 #include <linux/list.h>
+#include <linux/mod_devicetable.h>

 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.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