diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2009-09-26 21:42:49 -0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-27 02:13:06 -0400 |
| commit | b684a3637e0887683a0a3d6fd471fc41d7c1606a (patch) | |
| tree | 8dd84010d99afb089139098044226f53e08e1053 /drivers/platform | |
| parent | 0d9df2515dbceb67d343c0f10fd3ff218380d524 (diff) | |
| download | kernel-crypto-b684a3637e0887683a0a3d6fd471fc41d7c1606a.tar.gz kernel-crypto-b684a3637e0887683a0a3d6fd471fc41d7c1606a.tar.xz kernel-crypto-b684a3637e0887683a0a3d6fd471fc41d7c1606a.zip | |
thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem
Fix this problem when CONFIG_THINKPAD_ACPI_HOTKEY_POLL is undefined:
CHECK drivers/platform/x86/thinkpad_acpi.c
drivers/platform/x86/thinkpad_acpi.c:1968:21: error: not an lvalue
CC [M] drivers/platform/x86/thinkpad_acpi.o
drivers/platform/x86/thinkpad_acpi.c: In function 'tpacpi_hotkey_driver_mask_set':
drivers/platform/x86/thinkpad_acpi.c:1968: error: lvalue required as left operand of assignment
Reported-by: Noah Dain <noahdain@gmail.com>
Reported-by: Audrius Kazukauskas <audrius@neutrino.lt>
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 3910f2f3ead..d93108d148f 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -2235,7 +2235,9 @@ static int tpacpi_hotkey_driver_mask_set(const u32 mask) HOTKEY_CONFIG_CRITICAL_START hotkey_driver_mask = mask; +#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL hotkey_source_mask |= (mask & ~hotkey_all_mask); +#endif HOTKEY_CONFIG_CRITICAL_END rc = hotkey_mask_set((hotkey_acpi_mask | hotkey_driver_mask) & |