Commit c0f72d7c authored by Olof Johansson's avatar Olof Johansson

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: default avatarOlof Johansson <olof@lixom.net>
parent 0e51793e
...@@ -491,7 +491,6 @@ config ARCH_IOP32X ...@@ -491,7 +491,6 @@ config ARCH_IOP32X
depends on MMU depends on MMU
select CPU_XSCALE select CPU_XSCALE
select NEED_MACH_GPIO_H select NEED_MACH_GPIO_H
select NEED_MACH_IO_H
select NEED_RET_TO_USER select NEED_RET_TO_USER
select PLAT_IOP select PLAT_IOP
select PCI select PCI
...@@ -505,7 +504,6 @@ config ARCH_IOP33X ...@@ -505,7 +504,6 @@ config ARCH_IOP33X
depends on MMU depends on MMU
select CPU_XSCALE select CPU_XSCALE
select NEED_MACH_GPIO_H select NEED_MACH_GPIO_H
select NEED_MACH_IO_H
select NEED_RET_TO_USER select NEED_RET_TO_USER
select PLAT_IOP select PLAT_IOP
select PCI select PCI
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment