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 /drivers/acpi/button.c | |
| parent | cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4 (diff) | |
| parent | 1ba90e3a87c46500623afdc3898573e4a5ebb21b (diff) | |
Pull auto-load-modules into release branch
Diffstat (limited to 'drivers/acpi/button.c')
| -rw-r--r-- | drivers/acpi/button.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index cb4110b50cd..540581338ef 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -66,6 +66,16 @@ MODULE_AUTHOR("Paul Diefenbaugh"); MODULE_DESCRIPTION("ACPI Button Driver"); MODULE_LICENSE("GPL"); +static const struct acpi_device_id button_device_ids[] = { + {ACPI_BUTTON_HID_LID, 0}, + {ACPI_BUTTON_HID_SLEEP, 0}, + {ACPI_BUTTON_HID_SLEEPF, 0}, + {ACPI_BUTTON_HID_POWER, 0}, + {ACPI_BUTTON_HID_POWERF, 0}, + {"", 0}, +}; +MODULE_DEVICE_TABLE(acpi, button_device_ids); + static int acpi_button_add(struct acpi_device *device); static int acpi_button_remove(struct acpi_device *device, int type); static int acpi_button_info_open_fs(struct inode *inode, struct file *file); @@ -74,7 +84,7 @@ static int acpi_button_state_open_fs(struct inode *inode, struct file *file); static struct acpi_driver acpi_button_driver = { .name = "button", .class = ACPI_BUTTON_CLASS, - .ids = "button_power,button_sleep,PNP0C0D,PNP0C0C,PNP0C0E", + .ids = button_device_ids, .ops = { .add = acpi_button_add, .remove = acpi_button_remove, |