From 25a0816e6b357ab34cb6feb354278f0c1eb33699 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Tue, 16 Jun 2009 19:28:45 +0000
Subject: [PATCH] --- yaml --- r: 154207 b: refs/heads/master c:
 cede2cb6ee9b0ddaa3dbc9939418ff177a831600 h: refs/heads/master i:   154205:
 7830c4143d9eee807b6974b50f9658e9770bec23   154203:
 6cc8974b7dbe1c2e2d9a0b097718bd57139dfad1   154199:
 7ad6cf575dfd07e658e1acaf90d4baef6406b332   154191:
 008147eebe858b6aedde3d3dec412aa59439c2c9   154175:
 dced0a757d4f6d054c1ce86826bf4b90a2812da3 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/platform/x86/eeepc-laptop.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fb4db553c5bc..45fc6a863ab0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57599cc997b81a7c4f764693a7316886a72067fe
+refs/heads/master: cede2cb6ee9b0ddaa3dbc9939418ff177a831600
diff --git a/trunk/drivers/platform/x86/eeepc-laptop.c b/trunk/drivers/platform/x86/eeepc-laptop.c
index 46b5aa5e85f0..884d76b9e8ba 100644
--- a/trunk/drivers/platform/x86/eeepc-laptop.c
+++ b/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)