cpm_load_patch() - declartion conflict

Hi,

The build fails with following error

CC arch/powerpc/sysdev/micropatch.o
arch/powerpc/sysdev/micropatch.c:625: error: conflicting types for ‘cpm_load_patch’ include/asm/commproc.h:94: error: previous declaration of ‘cpm_load_patch’ was here arch/powerpc/sysdev/micropatch.c: In function ‘cpm_load_patch’:
arch/powerpc/sysdev/micropatch.c:630: warning: unused variable ‘smp’ arch/powerpc/sysdev/micropatch.c:629: warning: unused variable ‘spp’ arch/powerpc/sysdev/micropatch.c:628: warning: unused variable ‘iip’ make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1
make: *** [arch/powerpc/sysdev] Error 2

The 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.

--

index 0307c84..a2328b8 100644
@@ -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.
 */

--
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.