diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-03 01:14:35 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-03 01:14:35 -0500 |
| commit | 975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1 (patch) | |
| tree | 59b654df0b066b6d6b8ea16f5ae581b8fb45c1d5 /drivers/acpi/button.c | |
| parent | 1fcb71b84b05ff3bfd5b5b2eca9a9b3d13a76e3a (diff) | |
| parent | bfd80223d73f80e1d1c69dace9151756b3ef3b49 (diff) | |
| download | linux-975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1.tar.gz linux-975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1.tar.bz2 linux-975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1.zip | |
Pull sysfs into test branch
Conflicts:
Documentation/feature-removal-schedule.txt
include/acpi/acpi_drivers.h
Signed-off-by: Len Brown <len.brown@intel.com>
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); static struct acpi_driver acpi_button_driver = { .name = ACPI_BUTTON_DRIVER_NAME, .class = ACPI_BUTTON_CLASS, - .ids = "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", + .ids = "button_power,button_sleep,PNP0C0D,PNP0C0C,PNP0C0E", .ops = { .add = acpi_button_add, .remove = acpi_button_remove, |