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"
This commit is contained in:
Linus Torvalds
2010-07-16 08:22:40 -07:00
3 changed files with 8 additions and 7 deletions
+6 -6
View File
@@ -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;