diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-04-12 02:03:29 +0100 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-04-12 02:03:29 +0100 |
| commit | 83be9f889bf98c0d2a1027d73520bdb0f84377ed (patch) | |
| tree | 8feb07ceeebd896ac282df14ab05d7651cc8a309 /2.6.11/2.6.11-m68k-setup-prototypes.patch | |
| parent | script to generate tarballs (diff) | |
| download | linux-headers-patches-83be9f889bf98c0d2a1027d73520bdb0f84377ed.tar.gz linux-headers-patches-83be9f889bf98c0d2a1027d73520bdb0f84377ed.tar.bz2 linux-headers-patches-83be9f889bf98c0d2a1027d73520bdb0f84377ed.zip | |
fix from upstream
Diffstat (limited to '2.6.11/2.6.11-m68k-setup-prototypes.patch')
| -rw-r--r-- | 2.6.11/2.6.11-m68k-setup-prototypes.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/2.6.11/2.6.11-m68k-setup-prototypes.patch b/2.6.11/2.6.11-m68k-setup-prototypes.patch new file mode 100644 index 0000000..ffa78ce --- /dev/null +++ b/2.6.11/2.6.11-m68k-setup-prototypes.patch @@ -0,0 +1,23 @@ +define mem_info struct before we use it in a prototype + +--- include/asm-m68k/setup.h ++++ include/asm-m68k/setup.h +@@ -360,14 +360,14 @@ + #define COMMAND_LINE_SIZE CL_SIZE + + #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 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 */ + #endif + + #endif /* __KERNEL__ */ |