summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrey Borzenkov <arvidjaar@mail.ru>2008-03-05 00:06:35 +0100
committerLen Brown <len.brown@intel.com>2008-03-11 18:38:49 +0100
commit3b34e5232fa9776e9a4b3f539cd9fee7609c900e (patch)
tree3c0573028d03257c56a833031e9566aee17d5983 /drivers
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-3b34e5232fa9776e9a4b3f539cd9fee7609c900e.tar.xz
linux-3b34e5232fa9776e9a4b3f539cd9fee7609c900e.zip
ACPI: button: make real parent for input devices in device tree
Signed-off-by: Andrey Borzenkov <arvidjaar@mail.ru> Cc: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/button.c1
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)
input->phys = button->phys;
input->id.bustype = BUS_HOST;
input->id.product = button->type;
+ input->dev.parent = &device->dev;
switch (button->type) {
case ACPI_BUTTON_TYPE_POWER: