diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
| commit | 54f53f2b94feb72622bec7a8563fc487d9f97720 (patch) | |
| tree | ab0c4e1dcadd25a00fa7a4febf41bc43b864cf73 /drivers/acpi/button.c | |
| parent | f61fb8a52cdf8b9b6a6badde84aefe58cb35d315 (diff) | |
| parent | a4083c9271e0a697278e089f2c0b9a95363ada0a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/acpi/button.c')
| -rw-r--r-- | drivers/acpi/button.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 24a7865a57cb..6c5da83cdb68 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c | |||
| @@ -449,6 +449,7 @@ static int acpi_button_add(struct acpi_device *device) | |||
| 449 | input->phys = button->phys; | 449 | input->phys = button->phys; |
| 450 | input->id.bustype = BUS_HOST; | 450 | input->id.bustype = BUS_HOST; |
| 451 | input->id.product = button->type; | 451 | input->id.product = button->type; |
| 452 | input->dev.parent = &device->dev; | ||
| 452 | 453 | ||
| 453 | switch (button->type) { | 454 | switch (button->type) { |
| 454 | case ACPI_BUTTON_TYPE_POWER: | 455 | case ACPI_BUTTON_TYPE_POWER: |