Hello Linus, Andrew,

On 07/12/04 10:25, colin@colino.net 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

Colin's patch is fine, an updated version of the patch with an 
additional signed-off line is attached.

Please apply. Thanks!

CU
Michael.