From beebd4481b72359efbbb0ff1be3378c8765ba0ac Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Sat, 29 Nov 2008 07:21:29 +0100
Subject: [PATCH] --- yaml --- r: 128073 b: refs/heads/master c:
 3e54048691bce3f323fd5460695273be379803b9 h: refs/heads/master i:   128071:
 e41dad9675de154b55ff35ebdf85156925c43f41 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/acpi/ec.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4c705405ba30..7a2e772d7d5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5279dee26c0e8d7c4200993bfc4b540d2469598
+refs/heads/master: 3e54048691bce3f323fd5460695273be379803b9
diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c
index 3ba034fffda5..6276e5c0fefd 100644
--- a/trunk/drivers/acpi/ec.c
+++ b/trunk/drivers/acpi/ec.c
@@ -979,6 +979,7 @@ int __init acpi_ec_ecdt_probe(void)
 {
 	acpi_status status;
 	struct acpi_table_ecdt *ecdt_ptr;
+	acpi_handle dummy;
 
 	boot_ec = make_acpi_ec();
 	if (!boot_ec)
@@ -1011,7 +1012,6 @@ int __init acpi_ec_ecdt_probe(void)
 	}
 	/* This workaround is needed only on some broken machines,
 	 * which require early EC, but fail to provide ECDT */
-	acpi_handle x;
 	printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
 	status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
 					boot_ec, NULL);
@@ -1022,7 +1022,7 @@ int __init acpi_ec_ecdt_probe(void)
 	 * which needs it, has fake EC._INI method, so use it as flag.
 	 * Keep boot_ec struct as it will be needed soon.
 	 */
-	if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
+	if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &dummy)))
 		return -ENODEV;
 install:
 	if (!ec_install_handlers(boot_ec)) {