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