projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[linux-2.6-microblaze.git]
/
drivers
/
platform
/
x86
/
apple-gmux.c
diff --git
a/drivers/platform/x86/apple-gmux.c
b/drivers/platform/x86/apple-gmux.c
index
605a9be
..
b9429fb
100644
(file)
--- a/
drivers/platform/x86/apple-gmux.c
+++ b/
drivers/platform/x86/apple-gmux.c
@@
-519,7
+519,7
@@
static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
gmux_data->power_state = VGA_SWITCHEROO_ON;
- gmux_data->dhandle =
DEVICE_
ACPI_HANDLE(&pnp->dev);
+ gmux_data->dhandle = ACPI_HANDLE(&pnp->dev);
if (!gmux_data->dhandle) {
pr_err("Cannot find acpi handle for pnp device %s\n",
dev_name(&pnp->dev));