projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm/tegra/for-4.6-rc1' of http://anongit.freedesktop.org/git/tegra/linux...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_acpi.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_acpi.c
b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index
d5e6938
..
cdf5227
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_acpi.c
@@
-314,7
+314,7
@@
void nouveau_register_dsm_handler(void)
if (!r)
return;
- vga_switcheroo_register_handler(&nouveau_dsm_handler);
+ vga_switcheroo_register_handler(&nouveau_dsm_handler
, 0
);
}
/* Must be called for Optimus models before the card can be turned off */