diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-16 08:22:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-16 08:22:40 -0700 |
commit | cc10b6ffd39ef982f86de68d95e5811df82cf819 (patch) | |
tree | cb6f24f40d0211513321b5230b87efc022aeed1f /include | |
parent | 042bd1ff6cf255e71689db913786dbb6bb79542d (diff) | |
parent | 5b39187fad6faefae5ce1a1e997651d4e382b135 (diff) | |
download | kernel_samsung_crespo-cc10b6ffd39ef982f86de68d95e5811df82cf819.zip kernel_samsung_crespo-cc10b6ffd39ef982f86de68d95e5811df82cf819.tar.gz kernel_samsung_crespo-cc10b6ffd39ef982f86de68d95e5811df82cf819.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: w90p910_ts - fix call to setup_timer()
Input: synaptics - fix wrong dimensions check
Input: i8042 - mark stubs in i8042.h "static inline"
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/i8042.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/i8042.h b/include/linux/i8042.h index 9bf6870..a986ff5 100644 --- a/include/linux/i8042.h +++ b/include/linux/i8042.h @@ -46,31 +46,31 @@ int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str, #else -void i8042_lock_chip(void) +static inline void i8042_lock_chip(void) { } -void i8042_unlock_chip(void) +static inline void i8042_unlock_chip(void) { } -int i8042_command(unsigned char *param, int command) +static inline int i8042_command(unsigned char *param, int command) { return -ENODEV; } -bool i8042_check_port_owner(const struct serio *serio) +static inline bool i8042_check_port_owner(const struct serio *serio) { return false; } -int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str, +static inline int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str, struct serio *serio)) { return -ENODEV; } -int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str, +static inline int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str, struct serio *serio)) { return -ENODEV; |