From 6ec1d03a8117c28fac79e5435cde085f535ca2ba Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Sat, 8 Jan 2011 19:55:40 -0800
Subject: [PATCH] --- yaml --- r: 227885 b: refs/heads/master c:
 7027d8b570244f0fa3aaebccf0bcd8e95e172631 h: refs/heads/master i:   227883:
 0c83b06f5b26d31d621ed336804074ea405ae211 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/platform/x86/intel_ips.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2322e7057eb6..32501698d793 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a198be7f072190a44033b7de6084b090b9885ee
+refs/heads/master: 7027d8b570244f0fa3aaebccf0bcd8e95e172631
diff --git a/trunk/drivers/platform/x86/intel_ips.c b/trunk/drivers/platform/x86/intel_ips.c
index f0b3ad13c273..1294a39373ba 100644
--- a/trunk/drivers/platform/x86/intel_ips.c
+++ b/trunk/drivers/platform/x86/intel_ips.c
@@ -1474,7 +1474,7 @@ ips_gpu_turbo_enabled(struct ips_driver *ips)
 }
 
 void
-ips_link_to_i915_driver()
+ips_link_to_i915_driver(void)
 {
 	/* We can't cleanly get at the various ips_driver structs from
 	 * this caller (the i915 driver), so just set a flag saying