diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/acpi/button.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
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 24a7865a57c..6c5da83cdb6 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: |