From 6d80f0eeeded0e23c3c5e1f842f0de988e1d8ec8 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 15 Feb 2012 11:55:22 +0000 Subject: [PATCH] --- yaml --- r: 297593 b: refs/heads/master c: ba81f502e73cee92964af6c39eb8c8d7e44e38c1 h: refs/heads/master i: 297591: dbadc830ac18a4ceb2078ca15835d67aebe4b908 v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/arch/arm/mach-vexpress/include/mach/io.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 237b297dc59d..89c9fafad07c 100644 --- 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 index 385a3861a029..6b5f84887ce5 100644 --- 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 index 13522d86685e..0088cd388a84 100644 --- 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