1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/linux/2.6.11.3/linux-2.6.11-allow-gcc-4.0-asm-m68k.patch	Sat Feb 24 11:00:05 2007 +0000
     1.3 @@ -0,0 +1,32 @@
     1.4 +Fixes
     1.5 +
     1.6 +In file included from include/asm/setup.h:8,
     1.7 +                 from include/asm/machdep.h:8,
     1.8 +                 from include/asm/irq.h:6,
     1.9 +                 from include/asm/hardirq.h:8,
    1.10 +                 from include/linux/hardirq.h:6,
    1.11 +                 from include/asm-generic/local.h:6,
    1.12 +                 from include/asm/local.h:4,
    1.13 +                 from include/linux/module.h:21,
    1.14 +                 from init/main.c:16:
    1.15 +include/asm-m68k/setup.h:365: error: array type has incomplete element type
    1.16 +
    1.17 +when compiling with gcc-4.0.  (Affects ppc, too, for some reason.)
    1.18 +
    1.19 +--- linux-2.6.11.3/include/asm-m68k/setup.h.old	Fri Mar 18 13:48:03 2005
    1.20 ++++ linux-2.6.11.3/include/asm-m68k/setup.h	Fri Mar 18 13:48:14 2005
    1.21 +@@ -362,12 +362,13 @@
    1.22 + #ifndef __ASSEMBLY__
    1.23 + extern int m68k_num_memory;		/* # of memory blocks found (and used) */
    1.24 + extern int m68k_realnum_memory;		/* real # of memory blocks found */
    1.25 +-extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
    1.26 + 
    1.27 + struct mem_info {
    1.28 + 	unsigned long addr;		/* physical address of memory chunk */
    1.29 + 	unsigned long size;		/* length of memory chunk (in bytes) */
    1.30 + };
    1.31 ++
    1.32 ++extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
    1.33 + #endif
    1.34 + 
    1.35 + #endif /* __KERNEL__ */