]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: iop: fix mismerge of Kconfig
authorOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 18:07:51 +0000 (11:07 -0700)
committerArnd Bergmann <arnd@arndb.de>
Tue, 2 Oct 2012 13:30:36 +0000 (15:30 +0200)
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/Kconfig

index 9d72ed67e43268ed1f679bcaafd14f669da79e79..8319e46553c13f1ba2e704ddf396ebefd615c9b9 100644 (file)
@@ -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