---

yaml --- r: 177545 b: refs/heads/master c: d112ef9 h: refs/heads/master i: 177543: 5c333b5 v: v3
git-mirror · Dec 9, 2009 · 780c2e3 · 780c2e3
1 parent 6e8b48c
commit 780c2e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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]);