projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'isci-for-3.5' into misc
[firefly-linux-kernel-4.4.55.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 7814a760c16439e8d6a0c74da474b4a978ce9793..284bd25d5d2127a3d44f9d8efae7449b77edcfbd 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_acpi.c
@@
-270,7
+270,7
@@
static bool nouveau_dsm_detect(void)
struct acpi_buffer buffer = {sizeof(acpi_method_name), acpi_method_name};
struct pci_dev *pdev = NULL;
int has_dsm = 0;
- int has_optimus;
+ int has_optimus
= 0
;
int vga_count = 0;
bool guid_valid;
int retval;