[PATCH] Mac/m68k ADB HID

Benjamin Herrenschmidt benh at kernel.crashing.org
Tue Jun 10 17:22:42 EST 2003


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 at 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 at kernel.crashing.org>

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/





More information about the Linuxppc-dev mailing list