From: Olof Johansson Date: Sat, 22 Sep 2012 18:07:51 +0000 (-0700) Subject: ARM: iop: fix mismerge of Kconfig X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c0f72d7cde7e289f45278c4360ce452556ccb9aa;p=deliverable%2Flinux.git ARM: iop: fix mismerge of Kconfig I mismerged one of the branches that moves around gpio header file usage, and messed up for IOP. This fixes the obvious compilation failures caused by it. Signed-off-by: Olof Johansson --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6d2f7f5c0036..f3342d439af0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -491,7 +491,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 @@ -505,7 +504,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