From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-input@atrey.karlin.mff.cuni.cz, linuxppc-dev@ozlabs.org
Subject: [patch 03/10] m68k/mac: Make mac_hid_mouse_emulate_buttons() declaration visible
Date: Wed, 15 Aug 2007 11:45:42 +0200 [thread overview]
Message-ID: <20070815094849.163898629@mail.of.borg> (raw)
In-Reply-To: 20070815094539.181979221@mail.of.borg
[-- Attachment #1: mac-mac_hid_mouse_emulate_buttons-prototype.diff --]
[-- Type: text/plain, Size: 2051 bytes --]
From: Geert Uytterhoeven <geert@linux-m68k.org>
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>
---
drivers/char/keyboard.c | 4 ----
drivers/macintosh/mac_hid.c | 1 +
include/linux/kbd_kern.h | 3 +++
3 files changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1022,10 +1022,6 @@ static const unsigned short x86_keycodes
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);
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -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;
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
@@ -161,4 +161,7 @@ static inline void con_schedule_flip(str
schedule_delayed_work(&t->buf.work, 0);
}
+/* mac_hid.c */
+extern int mac_hid_mouse_emulate_buttons(int, unsigned int, int);
+
#endif
--
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2007-08-15 9:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-15 9:45 [patch 00/10] m68k patches for 2.6.23-rc3 Geert Uytterhoeven
2007-08-15 9:45 ` [patch 01/10] m68k: <asm/page.h> needs <linux/compiler.h> Geert Uytterhoeven
2007-08-15 9:45 ` [patch 02/10] m68k: Dont include RODATA into text segment Geert Uytterhoeven
2007-08-15 9:45 ` Geert Uytterhoeven [this message]
2007-08-15 9:45 ` [patch 04/10] m68k: Kill superfluous extern Geert Uytterhoeven
2007-08-15 9:45 ` [patch 05/10] m68k: Remove unnecessary m68k_memoffset export and init Geert Uytterhoeven
2007-08-15 9:45 ` [patch 06/10] remove dead code in via-pmu68k Geert Uytterhoeven
2007-08-15 9:45 ` [patch 07/10] m68k: Use _AC() instead of #ifdef __ASSEMBLY__ Geert Uytterhoeven
2007-08-15 9:45 ` [patch 08/10] m68k: Enable arbitary speed tty support Geert Uytterhoeven
2007-08-15 9:45 ` [patch 09/10] m68k: Fix a few hickups in drivers/scsi/Kconfig Geert Uytterhoeven
2007-08-15 9:45 ` [patch 10/10] zorro: Make sysfs `config attribute read-only Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070815094849.163898629@mail.of.borg \
--to=geert@linux-m68k.org \
--cc=akpm@linux-foundation.org \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@atrey.karlin.mff.cuni.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).