tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Kumar Gala and committed by
Linus Torvalds d054b5ac 694e50db

+6 -9
-1
arch/ppc/platforms/85xx/mpc8560_ads.c
··· 56 56 #include <syslib/ppc85xx_common.h> 57 57 #include <syslib/ppc85xx_setup.h> 58 58 59 - extern void cpm2_reset(void); 60 59 61 60 /* ************************************************************************ 62 61 *
+1 -1
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
··· 49 49 #include <asm/mpc85xx.h> 50 50 #include <asm/irq.h> 51 51 #include <asm/immap_85xx.h> 52 - #include <asm/immap_cpm2.h> 52 + #include <asm/cpm2.h> 53 53 #include <asm/ppc_sys.h> 54 54 #include <asm/kgdb.h> 55 55
+1 -2
arch/ppc/platforms/85xx/stx_gp3.c
··· 52 52 #include <asm/mpc85xx.h> 53 53 #include <asm/irq.h> 54 54 #include <asm/immap_85xx.h> 55 - #include <asm/immap_cpm2.h> 55 + #include <asm/cpm2.h> 56 56 #include <asm/mpc85xx.h> 57 57 #include <asm/ppc_sys.h> 58 58 59 59 #include <syslib/cpm2_pic.h> 60 60 #include <syslib/ppc85xx_common.h> 61 61 62 - extern void cpm2_reset(void); 63 62 64 63 unsigned char __res[sizeof(bd_t)]; 65 64
-1
arch/ppc/syslib/cpm2_common.c
··· 27 27 #include <asm/mpc8260.h> 28 28 #include <asm/page.h> 29 29 #include <asm/pgtable.h> 30 - #include <asm/immap_cpm2.h> 31 30 #include <asm/cpm2.h> 32 31 #include <asm/rheap.h> 33 32
+1 -2
arch/ppc/syslib/m8260_setup.c
··· 24 24 #include <asm/io.h> 25 25 #include <asm/pgtable.h> 26 26 #include <asm/mpc8260.h> 27 - #include <asm/immap_cpm2.h> 27 + #include <asm/cpm2.h> 28 28 #include <asm/machdep.h> 29 29 #include <asm/bootinfo.h> 30 30 #include <asm/time.h> ··· 33 33 34 34 unsigned char __res[sizeof(bd_t)]; 35 35 36 - extern void cpm2_reset(void); 37 36 extern void pq2_find_bridges(void); 38 37 extern void pq2pci_init_irq(void); 39 38 extern void idma_pci9_init(void);
+3 -2
include/asm-ppc/cpm2.h
··· 109 109 * and dual port ram. 110 110 */ 111 111 extern cpm_cpm2_t *cpmp; /* Pointer to comm processor */ 112 + 112 113 extern uint cpm_dpalloc(uint size, uint align); 113 114 extern int cpm_dpfree(uint offset); 114 115 extern uint cpm_dpalloc_fixed(uint offset, uint size, uint align); ··· 117 116 extern void *cpm_dpram_addr(uint offset); 118 117 extern void cpm_setbrg(uint brg, uint rate); 119 118 extern void cpm2_fastbrg(uint brg, uint rate, int div16); 119 + extern void cpm2_reset(void); 120 + 120 121 121 122 /* Buffer descriptors used by many of the CPM protocols. 122 123 */ ··· 1090 1087 1091 1088 #endif /* __CPM2__ */ 1092 1089 #endif /* __KERNEL__ */ 1093 - 1094 -