James Simmons <jsimmons@transvirtual.com> said:
[...]
> Done. Here is another patch.
>
> diff -urN -X /home/jsimmons/dontdiff linux-2.5.4-dj1/arch/m68k/amiga/config.c l
> inux/arch/m68k/amiga/config.c
> --- linux-2.5.4-dj1/arch/m68k/amiga/config.c Wed Jan 16 10:31:50 2002
> +++ linux/arch/m68k/amiga/config.c Wed Feb 13 10:26:42 2002
> @@ -69,11 +69,13 @@
> extern char m68k_debug_device[];
>
> static void amiga_sched_init(void (*handler)(int, void *, struct pt_regs *));
> +#ifndef CONFIG_KEYBOARD_AMIGA
> /* amiga specific keyboard functions */
> extern int amiga_keyb_init(void);
> extern int amiga_kbdrate (struct kbd_repeat *);
> extern int amiga_kbd_translate(unsigned char keycode, unsigned char *keycodep,
> char raw_mode);
> +#endif
The #ifdef isn't needed: As long as the functions aren't used, gcc won't
mind them declared if they aren't around.
[...]
> --- linux-2.5.4-dj1/arch/ppc/amiga/config.c Wed Jan 16 10:31:50 2002
> +++ linux/arch/ppc/amiga/config.c Wed Feb 13 10:26:42 2002
> @@ -77,9 +77,11 @@
> extern char m68k_debug_device[];
>
> static void amiga_sched_init(void (*handler)(int, void *, struct pt_regs *));
> +#ifndef CONFIG_KEYBOARD_AMIGA
> /* amiga specific keyboard functions */
> extern int amiga_keyb_init(void);
> extern int amiga_kbdrate (struct kbd_repeat *);
> +#endif
As above.
-- Horst von Brand http://counter.li.org # 22616 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Feb 15 2002 - 21:01:00 EST