diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-08-27 10:22:20 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-08-27 10:22:20 +0400 |
| commit | 93bb70e0c00f1be4cc857e4d8375c44058cce71e (patch) | |
| tree | 7b6a11844e00b3f4bf8281c7a799e61494220819 /drivers/platform/x86/asus-wmi.h | |
| parent | 6f314ebbaa2667d67a7206ba78f28e46cf47eda5 (diff) | |
| parent | c182ae42cc3611f7b3fa803c0bcab6e5d29bea63 (diff) | |
| download | linux-93bb70e0c00f1be4cc857e4d8375c44058cce71e.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c
Diffstat (limited to 'drivers/platform/x86/asus-wmi.h')
| -rw-r--r-- | drivers/platform/x86/asus-wmi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h index 9c1da8b81bea..4c9bd38bb0a2 100644 --- a/drivers/platform/x86/asus-wmi.h +++ b/drivers/platform/x86/asus-wmi.h @@ -46,6 +46,7 @@ struct quirk_entry { struct asus_wmi_driver { int brightness; int panel_power; + int wlan_ctrl_by_user; const char *name; struct module *owner; |