From: Kumar Gala <galak@freescale.com>

Added a proper prototype for cpm2_reset() which gets rid of a build
warning.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/ppc/platforms/85xx/mpc8560_ads.c        |    1 -
 arch/ppc/platforms/85xx/mpc85xx_cds_common.c |    2 +-
 arch/ppc/platforms/85xx/stx_gp3.c            |    3 +--
 arch/ppc/syslib/cpm2_common.c                |    1 -
 arch/ppc/syslib/m8260_setup.c                |    3 +--
 include/asm-ppc/cpm2.h                       |    5 +++--
 6 files changed, 6 insertions(+), 9 deletions(-)

diff -puN arch/ppc/platforms/85xx/mpc8560_ads.c~ppc32-add-proper-prototype-for-cpm2_reset arch/ppc/platforms/85xx/mpc8560_ads.c
--- devel/arch/ppc/platforms/85xx/mpc8560_ads.c~ppc32-add-proper-prototype-for-cpm2_reset	2005-07-14 20:15:16.000000000 -0700
+++ devel-akpm/arch/ppc/platforms/85xx/mpc8560_ads.c	2005-07-14 20:15:16.000000000 -0700
@@ -56,7 +56,6 @@
 #include <syslib/ppc85xx_common.h>
 #include <syslib/ppc85xx_setup.h>
 
-extern void cpm2_reset(void);
 
 /* ************************************************************************
  *
diff -puN arch/ppc/platforms/85xx/mpc85xx_cds_common.c~ppc32-add-proper-prototype-for-cpm2_reset arch/ppc/platforms/85xx/mpc85xx_cds_common.c
--- devel/arch/ppc/platforms/85xx/mpc85xx_cds_common.c~ppc32-add-proper-prototype-for-cpm2_reset	2005-07-14 20:15:16.000000000 -0700
+++ devel-akpm/arch/ppc/platforms/85xx/mpc85xx_cds_common.c	2005-07-14 20:15:16.000000000 -0700
@@ -49,7 +49,7 @@
 #include <asm/mpc85xx.h>
 #include <asm/irq.h>
 #include <asm/immap_85xx.h>
-#include <asm/immap_cpm2.h>
+#include <asm/cpm2.h>
 #include <asm/ppc_sys.h>
 #include <asm/kgdb.h>
 
diff -puN arch/ppc/platforms/85xx/stx_gp3.c~ppc32-add-proper-prototype-for-cpm2_reset arch/ppc/platforms/85xx/stx_gp3.c
--- devel/arch/ppc/platforms/85xx/stx_gp3.c~ppc32-add-proper-prototype-for-cpm2_reset	2005-07-14 20:15:16.000000000 -0700
+++ devel-akpm/arch/ppc/platforms/85xx/stx_gp3.c	2005-07-14 20:15:16.000000000 -0700
@@ -52,14 +52,13 @@
 #include <asm/mpc85xx.h>
 #include <asm/irq.h>
 #include <asm/immap_85xx.h>
-#include <asm/immap_cpm2.h>
+#include <asm/cpm2.h>
 #include <asm/mpc85xx.h>
 #include <asm/ppc_sys.h>
 
 #include <syslib/cpm2_pic.h>
 #include <syslib/ppc85xx_common.h>
 
-extern void cpm2_reset(void);
 
 unsigned char __res[sizeof(bd_t)];
 
diff -puN arch/ppc/syslib/cpm2_common.c~ppc32-add-proper-prototype-for-cpm2_reset arch/ppc/syslib/cpm2_common.c
--- devel/arch/ppc/syslib/cpm2_common.c~ppc32-add-proper-prototype-for-cpm2_reset	2005-07-14 20:15:16.000000000 -0700
+++ devel-akpm/arch/ppc/syslib/cpm2_common.c	2005-07-14 20:15:16.000000000 -0700
@@ -27,7 +27,6 @@
 #include <asm/mpc8260.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/immap_cpm2.h>
 #include <asm/cpm2.h>
 #include <asm/rheap.h>
 
diff -puN arch/ppc/syslib/m8260_setup.c~ppc32-add-proper-prototype-for-cpm2_reset arch/ppc/syslib/m8260_setup.c
--- devel/arch/ppc/syslib/m8260_setup.c~ppc32-add-proper-prototype-for-cpm2_reset	2005-07-14 20:15:16.000000000 -0700
+++ devel-akpm/arch/ppc/syslib/m8260_setup.c	2005-07-14 20:15:16.000000000 -0700
@@ -24,7 +24,7 @@
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/mpc8260.h>
-#include <asm/immap_cpm2.h>
+#include <asm/cpm2.h>
 #include <asm/machdep.h>
 #include <asm/bootinfo.h>
 #include <asm/time.h>
@@ -33,7 +33,6 @@
 
 unsigned char __res[sizeof(bd_t)];
 
-extern void cpm2_reset(void);
 extern void pq2_find_bridges(void);
 extern void pq2pci_init_irq(void);
 extern void idma_pci9_init(void);
diff -puN include/asm-ppc/cpm2.h~ppc32-add-proper-prototype-for-cpm2_reset include/asm-ppc/cpm2.h
--- devel/include/asm-ppc/cpm2.h~ppc32-add-proper-prototype-for-cpm2_reset	2005-07-14 20:15:16.000000000 -0700
+++ devel-akpm/include/asm-ppc/cpm2.h	2005-07-14 20:15:16.000000000 -0700
@@ -109,6 +109,7 @@ static inline long IS_DPERR(const uint o
  * and dual port ram.
  */
 extern		cpm_cpm2_t	*cpmp;	 /* Pointer to comm processor */
+
 extern uint cpm_dpalloc(uint size, uint align);
 extern int cpm_dpfree(uint offset);
 extern uint cpm_dpalloc_fixed(uint offset, uint size, uint align);
@@ -116,6 +117,8 @@ extern void cpm_dpdump(void);
 extern void *cpm_dpram_addr(uint offset);
 extern void cpm_setbrg(uint brg, uint rate);
 extern void cpm2_fastbrg(uint brg, uint rate, int div16);
+extern void cpm2_reset(void);
+
 
 /* Buffer descriptors used by many of the CPM protocols.
 */
@@ -1087,5 +1090,3 @@ typedef struct im_idma {
 
 #endif /* __CPM2__ */
 #endif /* __KERNEL__ */
-
-
_