From 2ec9469341e347aea0f2f41ea9acd54a2aa4feef Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 12 Oct 2012 14:36:56 -0400
Subject: [PATCH] --- yaml --- r: 334780 b: refs/heads/master c:
 e9d1aa05da264cf7e1906b81a90d6abfdbe3700b h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/xen/xenbus/xenbus_xs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e20bc4ca7855..4a05b548c4c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2103b7ef7ecb4d17138b6ced4aad1b576affc4e
+refs/heads/master: e9d1aa05da264cf7e1906b81a90d6abfdbe3700b
diff --git a/trunk/drivers/xen/xenbus/xenbus_xs.c b/trunk/drivers/xen/xenbus/xenbus_xs.c
index 48220e129f85..f5dda83ad7a5 100644
--- a/trunk/drivers/xen/xenbus/xenbus_xs.c
+++ b/trunk/drivers/xen/xenbus/xenbus_xs.c
@@ -625,7 +625,7 @@ static struct xenbus_watch *find_watch(const char *token)
  * so if we are running on anything older than 4 do not attempt to read
  * control/platform-feature-xs_reset_watches.
  */
-static bool xen_strict_xenbus_quirk()
+static bool xen_strict_xenbus_quirk(void)
 {
 	uint32_t eax, ebx, ecx, edx, base;