Input: i8042 - mark stubs in i8042.h "static inline" (c59690fa) · Commits · 戴 / test

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>

include/linux/i8042.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -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;

Admin message