Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Olof Johansson 12 years ago
parent
0e51793e16
commit
c0f72d7cde
1 changed files with 0 additions and 2 deletions
Split View Show Diff Stats
  1. 0 2
      arch/arm/Kconfig

+ 0 - 2
arch/arm/Kconfig
View File 

@@ -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