mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

Input: i8042 - mark stubs in i8042.h "static inline"

Browse source 
Otherwise we may run into following:

drivers/platform/built-in.o: In function `i8042_lock_chip':
/home/test/ws2/projects/linux-2.6/include/linux/i8042.h:50: multiple definition of `i8042_lock_chip'
drivers/input/serio/built-in.o:/home/test/ws2/projects/linux-2.6/include/linux/i8042.h:50: first defined here
...
make[1]: *** [drivers/built-in.o] Error 1
make: *** [drivers] Error 2

Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Feng Tang 2010-06-30 00:53:53 -07:00 committed by Dmitry Torokhov
parent 3267a87f9d
commit c59690fa48
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/linux/i8042.h
View file

@ -46,31 +46,31 @@ int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str,
#else #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; return -ENODEV;
} }
bool i8042_check_port_owner(const struct serio *serio) static inline bool i8042_check_port_owner(const struct serio *serio)
{ {
return false; 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)) struct serio *serio))
{ {
return -ENODEV; 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)) struct serio *serio))
{ {
return -ENODEV; return -ENODEV;