diff options
| author | Feng Tang <feng.tang@intel.com> | 2010-06-30 03:53:53 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 04:21:38 -0400 |
| commit | c59690fa484c04ab96fe932241b569a09755a4d2 (patch) | |
| tree | ebc009b73b806007868a2a6f13357dfe90d89132 | |
| parent | 3267a87f9dc38d036571ff0880533d9ae8989f01 (diff) | |
Input: i8042 - mark stubs in i8042.h "static inline"
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>
| -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 9bf6870ee5f4..a986ff588944 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, | |||
| 46 | 46 | ||
| 47 | #else | 47 | #else |
| 48 | 48 | ||
| 49 | void i8042_lock_chip(void) | 49 | static inline void i8042_lock_chip(void) |
| 50 | { | 50 | { |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | void i8042_unlock_chip(void) | 53 | static inline void i8042_unlock_chip(void) |
| 54 | { | 54 | { |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | int i8042_command(unsigned char *param, int command) | 57 | static inline int i8042_command(unsigned char *param, int command) |
| 58 | { | 58 | { |
| 59 | return -ENODEV; | 59 | return -ENODEV; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | bool i8042_check_port_owner(const struct serio *serio) | 62 | static inline bool i8042_check_port_owner(const struct serio *serio) |
| 63 | { | 63 | { |
| 64 | return false; | 64 | return false; |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str, | 67 | static inline int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str, |
| 68 | struct serio *serio)) | 68 | struct serio *serio)) |
| 69 | { | 69 | { |
| 70 | return -ENODEV; | 70 | return -ENODEV; |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str, | 73 | static inline int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str, |
| 74 | struct serio *serio)) | 74 | struct serio *serio)) |
| 75 | { | 75 | { |
| 76 | return -ENODEV; | 76 | return -ENODEV; |
