projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cbf1146)
ASoC: Fix up merge with the ARM tree
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Mar 2009 19:51:07 +0000 (19:51 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Mar 2009 19:51:07 +0000 (19:51 +0000)
The same change has been made with the final lines in slightly differnet
orders.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
arch/arm/mach-shark/include/mach/io.h patch | blob | blame | history

diff --git a/arch/arm/mach-shark/include/mach/io.h b/arch/arm/mach-shark/include/mach/io.h
index 8ca7d7f09bdc383ca418812ec6324bc8ab2fe58b..568daea93fb1ea1bacdbe456a30df90b7d639952 100644 (file)
--- 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