diff options
| author | Len Brown <len.brown@intel.com> | 2009-06-24 01:22:20 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-06-24 01:22:20 -0400 |
| commit | 57599cc997b81a7c4f764693a7316886a72067fe (patch) | |
| tree | 2e5cd27682614c88ec72009f9605062ada6eae25 /include/acpi | |
| parent | fbe8cddd2d85979d273d7937a2b8a47498694d91 (diff) | |
| parent | 586caae36cece718ff46b3a59b88af79e9f7a2e0 (diff) | |
| download | linux-57599cc997b81a7c4f764693a7316886a72067fe.tar.gz linux-57599cc997b81a7c4f764693a7316886a72067fe.tar.bz2 linux-57599cc997b81a7c4f764693a7316886a72067fe.zip | |
Merge branch 'bjorn-notify' into release
Conflicts:
drivers/platform/x86/eeepc-laptop.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index bf1f43bd9016..c65e4ce6c3af 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -114,10 +114,13 @@ struct acpi_device_ops { acpi_op_notify notify; }; +#define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */ + struct acpi_driver { char name[80]; char class[80]; const struct acpi_device_id *ids; /* Supported Hardware IDs */ + unsigned int flags; struct acpi_device_ops ops; struct device_driver drv; struct module *owner; |