From: Olof Johansson Date: Sat, 22 Sep 2012 18:07:51 +0000 (-0700) Subject: ARM: iop: fix mismerge of Kconfig X-Git-Tag: next-20121003~10^2^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=947cabbdd5a7c3d617a942f03cf7a435a4e35168;p=karo-tx-linux.git ARM: iop: fix mismerge of Kconfig Signed-off-by: Olof Johansson --- 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