From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 10 Mar 2009 19:51:07 +0000 (+0000)
Subject: ASoC: Fix up merge with the ARM tree
X-Git-Tag: v2.6.30-rc1~8^2~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f455dfb106916d855d59686fe16575c2ceb2cb2a;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

diff --git a/arch/arm/mach-shark/include/mach/io.h b/arch/arm/mach-shark/include/mach/io.h
index 8ca7d7f..568daea 100644
--- a/arch/arm/mach-shark/include/mach/io.h
+++ b/arch/arm/mach-shark/include/mach/io.h
@@ -15,6 +15,7 @@
 #define IO_SPACE_LIMIT	0xffffffff
 
 #define __io(a)		__typesafe_io(PCIO_BASE + (a))
+
 #define __mem_pci(addr)	(addr)
 
 #endif