Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b8777b4 authored by Vladimir Barinov's avatar Vladimir Barinov Committed by Russell King
Browse files

[ARM] 4296/1: ixp4xx: compile fix 



Fix compilation fail for ixp4xx platforms for the case when CONFIG_IXP4XX_INDIRECT_PCI is set. That is due to the check_signature() is appeared in include/linux/io.h.

Signed-off-by: default avatarVladimir Barinov <vbarinov@ru.mvista.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2848e647

include/asm-arm/arch-ixp4xx/io.h

+0 −17
Original line number Diff line number Diff line
@@ -238,23 +238,6 @@ __ixp4xx_readsl(const volatile void __iomem *bus_addr, u32 *vaddr, u32 count) 
#define memcpy_fromio(a,c,l)		_memcpy_fromio((a),(c),(l))

#define memcpy_toio(c,a,l)		_memcpy_toio((c),(a),(l))



static inline int

check_signature(const unsigned char __iomem *bus_addr, const unsigned char *signature,

		int length)

{

	int retval = 0;

	do {

		if (readb(bus_addr) != *signature)

			goto out;

		bus_addr++;

		signature++;

		length--;

	} while (length);

	retval = 1;

out:

	return retval;

}



#endif



#ifndef CONFIG_PCI