Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible

m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible

drivers/char/keyboard.c: In function 'kbd_keycode':
drivers/char/keyboard.c:1142: error: implicit declaration of function 'mac_hid_mouse_emulate_buttons'

The forward declaration of mac_hid_mouse_emulate_buttons() is not visible on
m68k because it's hidden in the middle of a big #ifdef block.

Move it to <linux/kbd_kern.h>, correct the type of the second parameter, and
include <linux/kbd_kern.h> where needed.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Geert Uytterhoeven and committed by
Linus Torvalds
2301060e a0108668

+4 -4
-4
drivers/char/keyboard.c
··· 1022 1022 308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330, 1023 1023 332,340,365,342,343,344,345,346,356,270,341,368,369,370,371,372 }; 1024 1024 1025 - #ifdef CONFIG_MAC_EMUMOUSEBTN 1026 - extern int mac_hid_mouse_emulate_buttons(int, int, int); 1027 - #endif /* CONFIG_MAC_EMUMOUSEBTN */ 1028 - 1029 1025 #ifdef CONFIG_SPARC 1030 1026 static int sparc_l1_a_state = 0; 1031 1027 extern void sun_do_break(void);
+1
drivers/macintosh/mac_hid.c
··· 13 13 #include <linux/sysctl.h> 14 14 #include <linux/input.h> 15 15 #include <linux/module.h> 16 + #include <linux/kbd_kern.h> 16 17 17 18 18 19 static struct input_dev *emumousebtn;
+3
include/linux/kbd_kern.h
··· 161 161 schedule_delayed_work(&t->buf.work, 0); 162 162 } 163 163 164 + /* mac_hid.c */ 165 + extern int mac_hid_mouse_emulate_buttons(int, unsigned int, int); 166 + 164 167 #endif