diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /drivers/acpi/button.c | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/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: |