---

yaml --- r: 297593 b: refs/heads/master c: ba81f50 h: refs/heads/master i: 297591: dbadc83 v: v3
git-mirror · Mar 24, 2012 · 6d80f0e · 6d80f0e
1 parent 55e880c
commit 6d80f0e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5936d1161ff503a1170722fe9b2d9ac4da700eef
+refs/heads/master: ba81f502e73cee92964af6c39eb8c8d7e44e38c1
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -313,6 +313,7 @@ config ARCH_VEXPRESS
 	select HAVE_CLK
 	select HAVE_PATA_PLATFORM
 	select ICST
+	select NO_IOPORT
 	select PLAT_VERSATILE
 	select PLAT_VERSATILE_CLCD
 	help

diff --git a/trunk/arch/arm/mach-vexpress/include/mach/io.h b/trunk/arch/arm/mach-vexpress/include/mach/io.h
@@ -20,7 +20,6 @@
 #ifndef __ASM_ARM_ARCH_IO_H
 #define __ASM_ARM_ARCH_IO_H
 
-#define __io(a)		__typesafe_io(a)
 #define __mem_pci(a)	(a)
 
 #endif