Re: [PATCH] fix saa7146 compilation on 2.6.8-rc1

[Geert U. <ge...@li...>]

On Mon, 12 Jul 2004, Colin LEROY wrote:
> > On Mon, 12 Jul 2004 co...@co... wrote:
> > > this patch fixes a compilation error on 2.6.8-rc1. Here's the error:
> > > drivers/media/common/saa7146_video.c:3: conflicting types for `memory'
> > > include/asm-m68k/setup.h:365: previous declaration of `memory'
> > > make[3]: *** [drivers/media/common/saa7146_video.o] Error 1
> >
> > But there's nothing named plain `memory' in include/asm-m68k/setup.h?!?!?
> > Actually there never has been...
>
> Right, but (i should have specified, sorry), I compiled on ppc32, and there's
>
> #define m68k_num_memory num_memory
> #define m68k_memory memory
> #include <asm-m68k/setup.h
>
> in include/asm-ppc/setup.h.

Ah, didn't think of that (I should have known ;-)

Looks like the APUS code can need some clean up. E.g. arch/ppc/amiga/bootinfo.c
operates on both memory and m68k_memory, while they are identical due to
<asm/setup.h>...

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

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

--i6CFh4XJ004656.1089646984/witte.sonytel.be--
ReSent-Date: Tue, 13 Jul 2004 10:08:34 +0200 (MEST)
ReSent-From: Geert Uytterhoeven <ge...@so...>
ReSent-To: 
    Linux/PPC on APUS development <lin...@li...>
ReSent-Subject: Re: [PATCH] fix saa7146 compilation on 2.6.8-rc1
ReSent-Message-ID: <Pin...@wa...>

On Mon, 12 Jul 2004, Colin LEROY wrote:
> > On Mon, 12 Jul 2004 co...@co... wrote:
> > > this patch fixes a compilation error on 2.6.8-rc1. Here's the error:
> > > drivers/media/common/saa7146_video.c:3: conflicting types for `memory'
> > > include/asm-m68k/setup.h:365: previous declaration of `memory'
> > > make[3]: *** [drivers/media/common/saa7146_video.o] Error 1
> >
> > But there's nothing named plain `memory' in include/asm-m68k/setup.h?!?!?
> > Actually there never has been...
>
> Right, but (i should have specified, sorry), I compiled on ppc32, and there's
>
> #define m68k_num_memory num_memory
> #define m68k_memory memory
> #include <asm-m68k/setup.h
>
> in include/asm-ppc/setup.h.

Ah, didn't think of that (I should have known ;-)

Looks like the APUS code can need some clean up. E.g. arch/ppc/amiga/bootinfo.c
operates on both memory and m68k_memory, while they are identical due to
<asm/setup.h>...

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

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

--i6CFh4XJ004656.1089646984/witte.sonytel.be--