diff --git a/[refs] b/[refs]
index 97d51a817d2c..f95631e53d9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26f41062f28de65e11d3cf353e52d0be73442be1
+refs/heads/master: 309c665110ee6a8d9a28f802c41eaab50ceebbf7
diff --git a/trunk/drivers/pci/hotplug/cpcihp_generic.c b/trunk/drivers/pci/hotplug/cpcihp_generic.c
index fb3f84661bdc..81af764c629b 100644
--- a/trunk/drivers/pci/hotplug/cpcihp_generic.c
+++ b/trunk/drivers/pci/hotplug/cpcihp_generic.c
@@ -62,7 +62,7 @@
 #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
 
 /* local variables */
-static int debug;
+static bool debug;
 static char *bridge;
 static u8 bridge_busnr;
 static u8 bridge_slot;