Commit 4d20826f authored Nov 05, 2007 by Kamalesh Babulal Committed by Linus Torvalds Nov 05, 2007

cpm_load_patch() - declartion conflict



Commit f2a0bd37 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>

parent 05aa3450

include/asm-powerpc/commproc.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.
		*/