From 36214966dc5d687211563c727e0b923f4c2e3a29 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 2 May 2012 20:26:24 +0100
Subject: [PATCH] --- yaml --- r: 300011 b: refs/heads/master c:
 addde4ec31456c5f1e9b61aae3edcfeb0f338f87 h: refs/heads/master i:   300009:
 72919bd17c988e7044ea57ff5a1cdc9fff8f1259   300007:
 ee59b0c6b1e57042fafc51b792dbc2823a71bb66 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f6d3f2debe22..59fb58709136 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6586240a66e38dff2fbefd89451cfcdd68dceac
+refs/heads/master: addde4ec31456c5f1e9b61aae3edcfeb0f338f87
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c b/trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c
index 7814a760c164..284bd25d5d21 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -270,7 +270,7 @@ static bool nouveau_dsm_detect(void)
 	struct acpi_buffer buffer = {sizeof(acpi_method_name), acpi_method_name};
 	struct pci_dev *pdev = NULL;
 	int has_dsm = 0;
-	int has_optimus;
+	int has_optimus = 0;
 	int vga_count = 0;
 	bool guid_valid;
 	int retval;