Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c59690fa484c04ab96fe932241b569a09755a4d2

Authored by Feng Tang
Committed by Dmitry Torokhov
1 parent 3267a87f9d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 6 additions and 6 deletions Side-by-side Diff

include/linux/i8042.h
Diff comments   View file @ c59690f
... ... @@ -46,31 +46,31 @@
46 46  
47 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 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 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 68 struct serio *serio))
69 69 {
70 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 74 struct serio *serio))
75 75 {
76 76 return -ENODEV;