From: Kamalesh Babulal Date: Mon, 5 Nov 2007 10:41:12 +0000 (+0530) Subject: cpm_load_patch() - declartion conflict X-Git-Tag: v2.6.24-rc2~34 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d20826ffb6fa80c71b85d2cb858ae400a59a4d5;p=linux-2.6 cpm_load_patch() - declartion conflict Commit f2a0bd3753dad7ea4605ebd5435716b39e9f92bb defines the function with "void cpm_load_patch(cpm8xx_t *cp)" prtotype and is declared as "extern void cpm_load_patch(volatile immap_t *immr)" in the header file. Signed-off-by: Kamalesh Babulal Signed-off-by: Linus Torvalds --- diff --git a/include/asm-powerpc/commproc.h b/include/asm-powerpc/commproc.h index 0307c84a5c..a2328b8add 100644 --- a/include/asm-powerpc/commproc.h +++ b/include/asm-powerpc/commproc.h @@ -91,7 +91,7 @@ extern uint m8xx_cpm_hostalloc(uint size); extern int m8xx_cpm_hostfree(uint start); extern void m8xx_cpm_hostdump(void); -extern void cpm_load_patch(volatile immap_t *immr); +extern void cpm_load_patch(cpm8xx_t *cp); /* Buffer descriptors used by many of the CPM protocols. */