summaryrefslogtreecommitdiff
path: root/patches/linux/2.6.11.3/linux-2.6.11-allow-gcc-4.0-asm-m68k.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/linux/2.6.11.3/linux-2.6.11-allow-gcc-4.0-asm-m68k.patch')
-rw-r--r--patches/linux/2.6.11.3/linux-2.6.11-allow-gcc-4.0-asm-m68k.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/linux/2.6.11.3/linux-2.6.11-allow-gcc-4.0-asm-m68k.patch b/patches/linux/2.6.11.3/linux-2.6.11-allow-gcc-4.0-asm-m68k.patch
new file mode 100644
index 0000000..b349ee0
--- /dev/null
+++ b/patches/linux/2.6.11.3/linux-2.6.11-allow-gcc-4.0-asm-m68k.patch
@@ -0,0 +1,32 @@
+Fixes
+
+In file included from include/asm/setup.h:8,
+ from include/asm/machdep.h:8,
+ from include/asm/irq.h:6,
+ from include/asm/hardirq.h:8,
+ from include/linux/hardirq.h:6,
+ from include/asm-generic/local.h:6,
+ from include/asm/local.h:4,
+ from include/linux/module.h:21,
+ from init/main.c:16:
+include/asm-m68k/setup.h:365: error: array type has incomplete element type
+
+when compiling with gcc-4.0. (Affects ppc, too, for some reason.)
+
+--- linux-2.6.11.3/include/asm-m68k/setup.h.old Fri Mar 18 13:48:03 2005
++++ linux-2.6.11.3/include/asm-m68k/setup.h Fri Mar 18 13:48:14 2005
+@@ -362,12 +362,13 @@
+ #ifndef __ASSEMBLY__
+ extern int m68k_num_memory; /* # of memory blocks found (and used) */
+ extern int m68k_realnum_memory; /* real # of memory blocks found */
+-extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
+
+ struct mem_info {
+ unsigned long addr; /* physical address of memory chunk */
+ unsigned long size; /* length of memory chunk (in bytes) */
+ };
++
++extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
+ #endif
+
+ #endif /* __KERNEL__ */