Commit d054b5ac authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds

[PATCH] ppc32: Add proper prototype for cpm2_reset()

Added a proper prototype for cpm2_reset() which gets rid of a build
warning.
Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 694e50db
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
#include <syslib/ppc85xx_common.h> #include <syslib/ppc85xx_common.h>
#include <syslib/ppc85xx_setup.h> #include <syslib/ppc85xx_setup.h>
extern void cpm2_reset(void);
/* ************************************************************************ /* ************************************************************************
* *
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#include <asm/mpc85xx.h> #include <asm/mpc85xx.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_cpm2.h> #include <asm/cpm2.h>
#include <asm/ppc_sys.h> #include <asm/ppc_sys.h>
#include <asm/kgdb.h> #include <asm/kgdb.h>
......
...@@ -52,14 +52,13 @@ ...@@ -52,14 +52,13 @@
#include <asm/mpc85xx.h> #include <asm/mpc85xx.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/immap_85xx.h> #include <asm/immap_85xx.h>
#include <asm/immap_cpm2.h> #include <asm/cpm2.h>
#include <asm/mpc85xx.h> #include <asm/mpc85xx.h>
#include <asm/ppc_sys.h> #include <asm/ppc_sys.h>
#include <syslib/cpm2_pic.h> #include <syslib/cpm2_pic.h>
#include <syslib/ppc85xx_common.h> #include <syslib/ppc85xx_common.h>
extern void cpm2_reset(void);
unsigned char __res[sizeof(bd_t)]; unsigned char __res[sizeof(bd_t)];
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <asm/mpc8260.h> #include <asm/mpc8260.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/immap_cpm2.h>
#include <asm/cpm2.h> #include <asm/cpm2.h>
#include <asm/rheap.h> #include <asm/rheap.h>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/mpc8260.h> #include <asm/mpc8260.h>
#include <asm/immap_cpm2.h> #include <asm/cpm2.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/time.h> #include <asm/time.h>
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
unsigned char __res[sizeof(bd_t)]; unsigned char __res[sizeof(bd_t)];
extern void cpm2_reset(void);
extern void pq2_find_bridges(void); extern void pq2_find_bridges(void);
extern void pq2pci_init_irq(void); extern void pq2pci_init_irq(void);
extern void idma_pci9_init(void); extern void idma_pci9_init(void);
......
...@@ -109,6 +109,7 @@ static inline long IS_DPERR(const uint offset) ...@@ -109,6 +109,7 @@ static inline long IS_DPERR(const uint offset)
* and dual port ram. * and dual port ram.
*/ */
extern cpm_cpm2_t *cpmp; /* Pointer to comm processor */ extern cpm_cpm2_t *cpmp; /* Pointer to comm processor */
extern uint cpm_dpalloc(uint size, uint align); extern uint cpm_dpalloc(uint size, uint align);
extern int cpm_dpfree(uint offset); extern int cpm_dpfree(uint offset);
extern uint cpm_dpalloc_fixed(uint offset, uint size, uint align); extern uint cpm_dpalloc_fixed(uint offset, uint size, uint align);
...@@ -116,6 +117,8 @@ extern void cpm_dpdump(void); ...@@ -116,6 +117,8 @@ extern void cpm_dpdump(void);
extern void *cpm_dpram_addr(uint offset); extern void *cpm_dpram_addr(uint offset);
extern void cpm_setbrg(uint brg, uint rate); extern void cpm_setbrg(uint brg, uint rate);
extern void cpm2_fastbrg(uint brg, uint rate, int div16); extern void cpm2_fastbrg(uint brg, uint rate, int div16);
extern void cpm2_reset(void);
/* Buffer descriptors used by many of the CPM protocols. /* Buffer descriptors used by many of the CPM protocols.
*/ */
...@@ -1087,5 +1090,3 @@ typedef struct im_idma { ...@@ -1087,5 +1090,3 @@ typedef struct im_idma {
#endif /* __CPM2__ */ #endif /* __CPM2__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment