Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2301060e authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a0108668

drivers/char/keyboard.c

+0 −4
Original line number Diff line number Diff line
@@ -1022,10 +1022,6 @@ static const unsigned short x86_keycodes[256] = 
	308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330,

	332,340,365,342,343,344,345,346,356,270,341,368,369,370,371,372 };



#ifdef CONFIG_MAC_EMUMOUSEBTN

extern int mac_hid_mouse_emulate_buttons(int, int, int);

#endif /* CONFIG_MAC_EMUMOUSEBTN */



#ifdef CONFIG_SPARC

static int sparc_l1_a_state = 0;

extern void sun_do_break(void);

drivers/macintosh/mac_hid.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/sysctl.h>

#include <linux/input.h>

#include <linux/module.h>

#include <linux/kbd_kern.h>





static struct input_dev *emumousebtn;

include/linux/kbd_kern.h

+3 −0
Original line number Diff line number Diff line
@@ -161,4 +161,7 @@ static inline void con_schedule_flip(struct tty_struct *t) 
	schedule_delayed_work(&t->buf.work, 0);

}



/* mac_hid.c */

extern int mac_hid_mouse_emulate_buttons(int, unsigned int, int);



#endif