diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/acpi/acpi_bus.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/acpi/acpi_bus.h')
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 0b54e9a4a8a1..e496fac860ac 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -330,6 +330,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver); | |||
| 330 | int acpi_bus_unregister_driver(struct acpi_driver *driver); | 330 | int acpi_bus_unregister_driver(struct acpi_driver *driver); |
| 331 | int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, | 331 | int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, |
| 332 | acpi_handle handle, int type); | 332 | acpi_handle handle, int type); |
| 333 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); | ||
| 333 | int acpi_bus_start(struct acpi_device *device); | 334 | int acpi_bus_start(struct acpi_device *device); |
| 334 | 335 | ||
| 335 | int acpi_match_ids(struct acpi_device *device, char *ids); | 336 | int acpi_match_ids(struct acpi_device *device, char *ids); |