* [PATCH] Mac/m68k ADB HID
@ 2003-06-09 15:32 Geert Uytterhoeven
2003-06-10 7:22 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2003-06-09 15:32 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras; +Cc: Linux/PPC Development
Hi,
Is this OK for you? It fixes compilation for Mac/m68k.
---
ADB HID: Exclude PowerMac-specific things on classic Macs
--- linux-2.5.x/drivers/macintosh/adbhid.c Tue May 27 19:02:52 2003
+++ linux-m68k-2.5.x/drivers/macintosh/adbhid.c Sun Jun 8 11:10:58 2003
@@ -44,7 +44,9 @@
#include <linux/pmu.h>
#include <asm/machdep.h>
+#ifdef CONFIG_PPC
#include <asm/pmac_feature.h>
+#endif
#ifdef CONFIG_PMAC_BACKLIGHT
#include <asm/backlight.h>
@@ -160,6 +162,7 @@
return;
case 0x3f: /* ignore Powerbook Fn key */
return;
+#ifdef CONFIG_PPC
case 0x7e: /* Power key on PBook 3400 needs remapping */
switch(pmac_call_feature(PMAC_FTR_GET_MB_INFO,
NULL, PMAC_MB_INFO_MODEL, 0)) {
@@ -169,6 +172,7 @@
keycode = 0x7f;
}
break;
+#endif /* CONFIG_PPC */
}
if (adbhid[id]->keycode[keycode]) {
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
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Mac/m68k ADB HID
2003-06-09 15:32 [PATCH] Mac/m68k ADB HID Geert Uytterhoeven
@ 2003-06-10 7:22 ` Benjamin Herrenschmidt
2003-06-10 7:51 ` Geert Uytterhoeven
0 siblings, 1 reply; 3+ messages in thread
From: Benjamin Herrenschmidt @ 2003-06-10 7:22 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Paul Mackerras, Linux/PPC Development
On Mon, 2003-06-09 at 17:32, Geert Uytterhoeven wrote:
> Hi,
>
> Is this OK for you? It fixes compilation for Mac/m68k.
Looks ok, though I'd rather use Paul's new CONFIG_PPC_PMAC
here.
> ---
>
> ADB HID: Exclude PowerMac-specific things on classic Macs
>
> --- linux-2.5.x/drivers/macintosh/adbhid.c Tue May 27 19:02:52 2003
> +++ linux-m68k-2.5.x/drivers/macintosh/adbhid.c Sun Jun 8 11:10:58 2003
> @@ -44,7 +44,9 @@
> #include <linux/pmu.h>
>
> #include <asm/machdep.h>
> +#ifdef CONFIG_PPC
> #include <asm/pmac_feature.h>
> +#endif
>
> #ifdef CONFIG_PMAC_BACKLIGHT
> #include <asm/backlight.h>
> @@ -160,6 +162,7 @@
> return;
> case 0x3f: /* ignore Powerbook Fn key */
> return;
> +#ifdef CONFIG_PPC
> case 0x7e: /* Power key on PBook 3400 needs remapping */
> switch(pmac_call_feature(PMAC_FTR_GET_MB_INFO,
> NULL, PMAC_MB_INFO_MODEL, 0)) {
> @@ -169,6 +172,7 @@
> keycode = 0x7f;
> }
> break;
> +#endif /* CONFIG_PPC */
> }
>
> if (adbhid[id]->keycode[keycode]) {
>
> 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
--
Benjamin Herrenschmidt <benh@kernel.crashing.org>
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Mac/m68k ADB HID
2003-06-10 7:22 ` Benjamin Herrenschmidt
@ 2003-06-10 7:51 ` Geert Uytterhoeven
0 siblings, 0 replies; 3+ messages in thread
From: Geert Uytterhoeven @ 2003-06-10 7:51 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Paul Mackerras, Linux/PPC Development
On 10 Jun 2003, Benjamin Herrenschmidt wrote:
> On Mon, 2003-06-09 at 17:32, Geert Uytterhoeven wrote:
> > Is this OK for you? It fixes compilation for Mac/m68k.
>
> Looks ok, though I'd rather use Paul's new CONFIG_PPC_PMAC
> here.
OK, I'll change that, after .71 is released.
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
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-06-10 7:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-06-09 15:32 [PATCH] Mac/m68k ADB HID Geert Uytterhoeven
2003-06-10 7:22 ` Benjamin Herrenschmidt
2003-06-10 7:51 ` Geert Uytterhoeven
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).