---

yaml
---
r: 154207
b: refs/heads/master
c: cede2cb
h: refs/heads/master
i:
  154205: 7830c41
  154203: 6cc8974
  154199: 7ad6cf5
  154191: 008147e
  154175: dced0a7
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57599cc997b81a7c4f764693a7316886a72067fe
+refs/heads/master: cede2cb6ee9b0ddaa3dbc9939418ff177a831600

trunk/drivers/platform/x86/eeepc-laptop.c

@@ -321,6 +321,15 @@ static const struct rfkill_ops eeepc_rfkill_ops = {
 	.set_block = eeepc_rfkill_set,
 };
 
+static void __init eeepc_enable_camera(void)
+{
+	/*
+	 * If the following call to set_acpi() fails, it's because there's no
+	 * camera so we can ignore the error.
+	 */
+	set_acpi(CM_ASL_CAMERA, 1);
+}
+
 /*
  * Sys helpers
  */
@@ -983,6 +992,9 @@ static int __init eeepc_laptop_init(void)
 	result = eeepc_hwmon_init(dev);
 	if (result)
 		goto fail_hwmon;
+
+	eeepc_enable_camera();
+
 	/* Register platform stuff */
 	result = platform_driver_register(&platform_driver);
 	if (result)