From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Fri, 4 Oct 2013 10:38:23 +0000 (+0200)
Subject: block/z2ram: Remove duplicate external declarations
X-Git-Tag: v3.14-rc1~183^2~32
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b3ce71720560a9125aa0343bdbf501d887dbfb74;p=users%2Fjedix%2Flinux-maple.git

block/z2ram: Remove duplicate external declarations

Remove the external declarations for m68k_realnum_memory and m68k_memory,
which are already provided by <asm/setup.h>, to avoid conflicts later.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---

diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 8b2a60cee3a02..27de5046708a2 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -43,9 +43,6 @@
 #include <linux/zorro.h>
 
 
-extern int m68k_realnum_memory;
-extern struct mem_info m68k_memory[NUM_MEMINFO];
-
 #define Z2MINOR_COMBINED      (0)
 #define Z2MINOR_Z2ONLY        (1)
 #define Z2MINOR_CHIPONLY      (2)