diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 20:07:51 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-07 16:02:06 +0200 |
| commit | c0f72d7cde7e289f45278c4360ce452556ccb9aa (patch) | |
| tree | 0259b464e05a38f4cbfdb9c29e70880beef022cc /arch | |
| parent | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
| download | linux-c0f72d7cde7e289f45278c4360ce452556ccb9aa.tar.xz linux-c0f72d7cde7e289f45278c4360ce452556ccb9aa.zip | |
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 <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
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 |