diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 14:07:51 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-07 10:02:06 -0400 |
| commit | c0f72d7cde7e289f45278c4360ce452556ccb9aa (patch) | |
| tree | 0259b464e05a38f4cbfdb9c29e70880beef022cc /arch | |
| parent | 0e51793e162ca432fc5f04178cf82b80a92c2659 (diff) | |
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 | |||
| 491 | depends on MMU | 491 | depends on MMU |
| 492 | select CPU_XSCALE | 492 | select CPU_XSCALE |
| 493 | select NEED_MACH_GPIO_H | 493 | select NEED_MACH_GPIO_H |
| 494 | select NEED_MACH_IO_H | ||
| 495 | select NEED_RET_TO_USER | 494 | select NEED_RET_TO_USER |
| 496 | select PLAT_IOP | 495 | select PLAT_IOP |
| 497 | select PCI | 496 | select PCI |
| @@ -505,7 +504,6 @@ config ARCH_IOP33X | |||
| 505 | depends on MMU | 504 | depends on MMU |
| 506 | select CPU_XSCALE | 505 | select CPU_XSCALE |
| 507 | select NEED_MACH_GPIO_H | 506 | select NEED_MACH_GPIO_H |
| 508 | select NEED_MACH_IO_H | ||
| 509 | select NEED_RET_TO_USER | 507 | select NEED_RET_TO_USER |
| 510 | select PLAT_IOP | 508 | select PLAT_IOP |
| 511 | select PCI | 509 | select PCI |