diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-29 19:14:19 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-29 19:14:19 -0700 |
| commit | 1c39aaa3b8aa77dfc5c8b02d3f3735a3e6b5ac14 (patch) | |
| tree | 71b9cfa16b3e4d28c98cf95cd1d098bb930b91ed /include/linux | |
| parent | aaf356abef25b51d88bde2175a5c373f1f9ad49b (diff) | |
| parent | 6849d28d2887495d30326587387190b3ce0c65c8 (diff) | |
Merge "msm: qpnp-haptic: Update function declarations"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/qpnp/qpnp-haptic.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/qpnp/qpnp-haptic.h b/include/linux/qpnp/qpnp-haptic.h index 92a66e844f94..95e514a513e2 100644 --- a/include/linux/qpnp/qpnp-haptic.h +++ b/include/linux/qpnp/qpnp-haptic.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2016, 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 @@ -10,12 +10,13 @@ * GNU General Public License for more details. */ #ifndef __QPNP_HAPTIC_H +#define __QPNP_HAPTIC_H /* interface for the other module to play different sequences */ #ifdef CONFIG_QPNP_HAPTIC int qpnp_hap_play_byte(u8 data, bool on); #else -int qpnp_hap_play_byte(u8 data, bool on); +static inline int qpnp_hap_play_byte(u8 data, bool on) { return 0; } |