diff options
author | Maciej Wereski <m.wereski@partner.samsung.com> | 2017-02-06 02:47:38 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2017-02-06 02:47:29 -0800 |
commit | 451d8dcb234ec3afe7f9fba238ef21e42f488f2c (patch) | |
tree | 45d879ba794ad2c07336b51d17e244cc859ec742 | |
parent | ef78ad2e253abba608195b6e352f5e1442c6b1e2 (diff) | |
parent | a60349aa38f11dbf26424c661cf141a8c45f8415 (diff) | |
download | kernel-common-451d8dcb234ec3afe7f9fba238ef21e42f488f2c.tar.gz kernel-common-451d8dcb234ec3afe7f9fba238ef21e42f488f2c.tar.bz2 kernel-common-451d8dcb234ec3afe7f9fba238ef21e42f488f2c.zip |
Merge "Input: lifebook - use "static inline" instead of "inline" in lifebook.h" into tizen
-rw-r--r-- | drivers/input/mouse/lifebook.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h index 4c4326c6f504..0baf02a70a99 100644 --- a/drivers/input/mouse/lifebook.h +++ b/drivers/input/mouse/lifebook.h @@ -16,14 +16,14 @@ void lifebook_module_init(void); int lifebook_detect(struct psmouse *psmouse, bool set_properties); int lifebook_init(struct psmouse *psmouse); #else -inline void lifebook_module_init(void) +static inline void lifebook_module_init(void) { } -inline int lifebook_detect(struct psmouse *psmouse, bool set_properties) +static inline int lifebook_detect(struct psmouse *psmouse, bool set_properties) { return -ENOSYS; } -inline int lifebook_init(struct psmouse *psmouse) +static inline int lifebook_init(struct psmouse *psmouse) { return -ENOSYS; } |