summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKamalesh Babulal <kamalesh@linux.vnet.ibm.com>2007-11-05 16:11:12 +0530
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-05 11:38:29 -0800
commit4d20826ffb6fa80c71b85d2cb858ae400a59a4d5 (patch)
tree17d127713a03e2bf050389b949a812c28cdd52ee /include
parent05aa345034de6ae9c77fb93f6a796013641d57d5 (diff)
downloadlinux-4d20826ffb6fa80c71b85d2cb858ae400a59a4d5.tar.gz
linux-4d20826ffb6fa80c71b85d2cb858ae400a59a4d5.tar.bz2
linux-4d20826ffb6fa80c71b85d2cb858ae400a59a4d5.zip
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 <kamalesh@linux.vnet.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/commproc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/commproc.h b/include/asm-powerpc/commproc.h
index 0307c84a5c1d..a2328b8addd8 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.
*/