diff options
| author | Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> | 2007-11-05 05:41:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 14:38:29 -0500 |
| commit | 4d20826ffb6fa80c71b85d2cb858ae400a59a4d5 (patch) | |
| tree | 17d127713a03e2bf050389b949a812c28cdd52ee /include/asm-powerpc | |
| parent | 05aa345034de6ae9c77fb93f6a796013641d57d5 (diff) | |
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/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/commproc.h | 2 |
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); | |||
| 91 | extern int m8xx_cpm_hostfree(uint start); | 91 | extern int m8xx_cpm_hostfree(uint start); |
| 92 | extern void m8xx_cpm_hostdump(void); | 92 | extern void m8xx_cpm_hostdump(void); |
| 93 | 93 | ||
| 94 | extern void cpm_load_patch(volatile immap_t *immr); | 94 | extern void cpm_load_patch(cpm8xx_t *cp); |
| 95 | 95 | ||
| 96 | /* Buffer descriptors used by many of the CPM protocols. | 96 | /* Buffer descriptors used by many of the CPM protocols. |
| 97 | */ | 97 | */ |