From 947cabbdd5a7c3d617a942f03cf7a435a4e35168 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Sat, 22 Sep 2012 11:07:51 -0700 Subject: [PATCH] ARM: iop: fix mismerge of Kconfig Signed-off-by: Olof Johansson --- arch/arm/Kconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9d72ed67e432..8319e46553c1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -490,7 +490,6 @@ config ARCH_IOP32X depends on MMU select CPU_XSCALE select NEED_MACH_GPIO_H - select NEED_MACH_IO_H select NEED_RET_TO_USER select PLAT_IOP select PCI @@ -504,7 +503,6 @@ config ARCH_IOP33X depends on MMU select CPU_XSCALE select NEED_MACH_GPIO_H - select NEED_MACH_IO_H select NEED_RET_TO_USER select PLAT_IOP select PCI -- 2.39.5