diff options
| author |   Len Brown <len.brown@intel.com> | 2007-07-25 01:36:53 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-25 01:36:53 -0400 |
| commit | 323ef30af3a0da47cc761b04b262d98d0fe79126 (patch) | |
| tree | 37636b25acc557969aee51f1fe3e3cbc7a9760ea /include/acpi/acpi_bus.h | |
| parent | Pull d-states into release branch (diff) | |
| parent | ACPI: autoload modules - Create __mod_acpi_device_table symbol for all ACPI drivers (diff) | |
| download | linux-dev-323ef30af3a0da47cc761b04b262d98d0fe79126.tar.xz linux-dev-323ef30af3a0da47cc761b04b262d98d0fe79126.zip | |
Pull auto-load-modules into release branch
Diffstat (limited to 'include/acpi/acpi_bus.h')
| -rw-r--r-- | include/acpi/acpi_bus.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index a9f73efa01bc..533ef40f7ccf 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -131,7 +131,7 @@ struct acpi_device_ops { struct acpi_driver { char name[80]; char class[80]; - char *ids; /* Supported Hardware IDs */ + const struct acpi_device_id *ids; /* Supported Hardware IDs */ struct acpi_device_ops ops; struct device_driver drv; struct module *owner; @@ -341,7 +341,8 @@ int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, int acpi_bus_trim(struct acpi_device *start, int rmdevice); int acpi_bus_start(struct acpi_device *device); acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); -int acpi_match_ids(struct acpi_device *device, char *ids); +int acpi_match_device_ids(struct acpi_device *device, + const struct acpi_device_id *ids); int acpi_create_dir(struct acpi_device *); void acpi_remove_dir(struct acpi_device *); |