From c0f72d7cde7e289f45278c4360ce452556ccb9aa Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Sat, 22 Sep 2012 11:07:51 -0700 Subject: 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 --- arch/arm/Kconfig | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/arm/Kconfig') 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 -- cgit v1.2.3 From 898f08e159bb63eaa5843f8dc0dab9592d4bae4c Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 8 Oct 2012 14:37:53 -0700 Subject: arm: increase FORCE_MAX_ZONEORDER for TI AM33XX FORCE_MAX_ZONEORDER of 12 is needed to allocation more than 4MB of consistent DMA memory (da8xx frame buffer driver). Signed-off-by: Dejan Gacnik Signed-off-by: Yegor Yefremov Signed-off-by: Tony Lindgren --- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/Kconfig') diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8ac460a8f4ca..c0065c777e9b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1758,6 +1758,7 @@ source "mm/Kconfig" config FORCE_MAX_ZONEORDER int "Maximum zone order" if ARCH_SHMOBILE range 11 64 if ARCH_SHMOBILE + default "12" if SOC_AM33XX default "9" if SA1111 default "11" help -- cgit v1.2.3