diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-07 05:24:01 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-07 05:24:01 -0800 |
| commit | ccf3c89458246bca6b449e0b460d932565c21ddd (patch) | |
| tree | d754749cf25ed07a185eeefba4d94aac9a15baf1 /include/linux | |
| parent | ad65eb0904568b86ad3ae4640e7510f51adb8553 (diff) | |
| parent | 07f2f9952c78e03061565ff4e3fa9db9f660a11f (diff) | |
Merge "input: move qpnp-power-on driver into input/misc directory"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/input/qpnp-power-on.h (renamed from include/linux/qpnp/power-on.h) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/qpnp/power-on.h b/include/linux/input/qpnp-power-on.h index da8f5a8622dd..a2624ab57826 100644 --- a/include/linux/qpnp/power-on.h +++ b/include/linux/input/qpnp-power-on.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2015, 2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -60,7 +60,7 @@ enum pon_restart_reason { PON_RESTART_REASON_KEYS_CLEAR = 0x06, }; -#ifdef CONFIG_QPNP_POWER_ON +#ifdef CONFIG_INPUT_QPNP_POWER_ON int qpnp_pon_system_pwr_off(enum pon_power_off_type type); int qpnp_pon_is_warm_reset(void); int qpnp_pon_trigger_config(enum pon_trigger_source pon_src, bool enable); |