From 780c2e3dd9176d242111fbda531b38608974d171 Mon Sep 17 00:00:00 2001 From: Henrique de Moraes Holschuh Date: Wed, 9 Dec 2009 01:36:26 +0000 Subject: [PATCH] --- yaml --- r: 177545 b: refs/heads/master c: d112ef95d4ec1ee7fe7123e3f21e4aac0d57570c h: refs/heads/master i: 177543: 5c333b57c9a7eb7462ece7b87db8844a4525745a v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/thinkpad_acpi.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f17bd8b6eecf..1dff370ed901 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b30eb7d211840ba1a03f855d9e7b80a921368f2 +refs/heads/master: d112ef95d4ec1ee7fe7123e3f21e4aac0d57570c diff --git a/trunk/drivers/platform/x86/thinkpad_acpi.c b/trunk/drivers/platform/x86/thinkpad_acpi.c index 86418cd3e59d..dd8bd072c79a 100644 --- a/trunk/drivers/platform/x86/thinkpad_acpi.c +++ b/trunk/drivers/platform/x86/thinkpad_acpi.c @@ -8375,6 +8375,7 @@ static int __init thinkpad_acpi_module_init(void) PCI_VENDOR_ID_IBM; tpacpi_inputdev->id.product = TPACPI_HKEY_INPUT_PRODUCT; tpacpi_inputdev->id.version = TPACPI_HKEY_INPUT_VERSION; + tpacpi_inputdev->dev.parent = &tpacpi_pdev->dev; } for (i = 0; i < ARRAY_SIZE(ibms_init); i++) { ret = ibm_init(&ibms_init[i]);