projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
[cascardo/linux.git]
/
drivers
/
platform
/
x86
/
intel_ips.c
diff --git
a/drivers/platform/x86/intel_ips.c
b/drivers/platform/x86/intel_ips.c
index
f0b3ad1
..
1294a39
100644
(file)
--- a/
drivers/platform/x86/intel_ips.c
+++ b/
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