From: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Date: Sat, 16 Apr 2005 22:24:29 +0000 (-0700)
Subject: [PATCH] ppc32: fix compilation error in arch/ppc/syslib/open_pic_defs.h
X-Git-Tag: v2.6.12-rc3~202
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d8f6098d5b0e9755c79d05e30b185a6e964fd3fa;p=~emulex%2Finfiniband.git

[PATCH] ppc32: fix compilation error in arch/ppc/syslib/open_pic_defs.h

make defconfig give the following error on ppc (gcc-4):

arch/ppc/syslib/open_pic.c:36: error: static declaration of ‘OpenPIC’ follows non-static declaration
arch/ppc/syslib/open_pic_defs.h:175: error: previous declaration of ‘OpenPIC’ was here

Signed-Off-By: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/ppc/syslib/open_pic_defs.h b/arch/ppc/syslib/open_pic_defs.h
index 4f05624b249..6c94e713146 100644
--- a/arch/ppc/syslib/open_pic_defs.h
+++ b/arch/ppc/syslib/open_pic_defs.h
@@ -172,9 +172,6 @@ struct OpenPIC {
     OpenPIC_Processor Processor[OPENPIC_MAX_PROCESSORS];
 };
 
-extern volatile struct OpenPIC __iomem *OpenPIC;
-
-
     /*
      *  Current Task Priority Register
      */