diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-06 15:31:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-06 15:31:00 -0500 |
| commit | 57e1c5c87db512629dd44ddeb882a5aaf0e4299e (patch) | |
| tree | e71e8a132d4f696beeae1bdab59efeed9517ba66 /drivers/acpi/button.c | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
| parent | 76a2e849df47697706024262a8bbb83432b8bde7 (diff) | |
Pull test into release branch
Diffstat (limited to 'drivers/acpi/button.c')
| -rw-r--r-- | drivers/acpi/button.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index ac860583c203..c726612fafb6 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c | |||
| @@ -75,7 +75,7 @@ static int acpi_button_state_open_fs(struct inode *inode, struct file *file); | |||
| 75 | static struct acpi_driver acpi_button_driver = { | 75 | static struct acpi_driver acpi_button_driver = { |
| 76 | .name = ACPI_BUTTON_DRIVER_NAME, | 76 | .name = ACPI_BUTTON_DRIVER_NAME, |
| 77 | .class = ACPI_BUTTON_CLASS, | 77 | .class = ACPI_BUTTON_CLASS, |
| 78 | .ids = "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", | 78 | .ids = "button_power,button_sleep,PNP0C0D,PNP0C0C,PNP0C0E", |
| 79 | .ops = { | 79 | .ops = { |
| 80 | .add = acpi_button_add, | 80 | .add = acpi_button_add, |
| 81 | .remove = acpi_button_remove, | 81 | .remove = acpi_button_remove, |