From d3dffbd4e61d6cff9cc480c9a186a99bce8d471b Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 12 Oct 2009 21:34:25 -0700
Subject: [PATCH] --- yaml --- r: 167678 b: refs/heads/master c:
 7dcc9c230fcef0067efee17c1f8c3c84494a7ec8 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/input/serio/i8042-x86ia64io.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b4b5bb2a2b59..f9262dea23ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f5eeff4c93256ee93435a3bf08cf18c45e9a994
+refs/heads/master: 7dcc9c230fcef0067efee17c1f8c3c84494a7ec8
diff --git a/trunk/drivers/input/serio/i8042-x86ia64io.h b/trunk/drivers/input/serio/i8042-x86ia64io.h
index a39bc4eb902b..77ff205c8577 100644
--- a/trunk/drivers/input/serio/i8042-x86ia64io.h
+++ b/trunk/drivers/input/serio/i8042-x86ia64io.h
@@ -661,7 +661,7 @@ static void i8042_pnp_exit(void)
 static int __init i8042_pnp_init(void)
 {
 	char kbd_irq_str[4] = { 0 }, aux_irq_str[4] = { 0 };
-	int pnp_data_busted = false;
+	bool pnp_data_busted = false;
 	int err;
 
 #ifdef CONFIG_X86