Commit f455dfb1 authored Mar 10, 2009 by Mark Brown

ASoC: Fix up merge with the ARM tree



The same change has been made with the final lines in slightly differnet
orders.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent cbf1146d

arch/arm/mach-shark/include/mach/io.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#define IO_SPACE_LIMIT 0xffffffff

		#define __io(a) __typesafe_io(PCIO_BASE + (a))

		#define __mem_pci(addr) (addr)

		#endif