/*
 * arch/arm/mach-shark/include/mach/io.h
 *
 * by Alexander Schulz
 *
 * derived from:
 * arch/arm/mach-ebsa110/include/mach/io.h
 * Copyright (C) 1997,1998 Russell King
 */

#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H

#define PCIO_BASE	0xe0000000
#define IO_SPACE_LIMIT	0xffffffff

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

#endif

/*
 * arch/arm/mach-shark/include/mach/io.h
 *
 * by Alexander Schulz
 *
 * derived from:
 * arch/arm/mach-ebsa110/include/mach/io.h
 * Copyright (C) 1997,1998 Russell King
 */

#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H

#define PCIO_BASE	0xe0000000
#define IO_SPACE_LIMIT	0xffffffff

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

#define __mem_pci(addr)	(addr)

#endif

Fix up merge with the ARM tree
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 <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>
