From: Russell King Date: Sun, 11 Sep 2011 09:36:32 +0000 (+0100) Subject: Merge branches 'amba', 'fixes', 'gpio', 'io' (early part), 'p2v', 'pgt' and 'pm'... X-Git-Tag: next-20110912~101^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e81a5597570deb83c9aefeb46ea8f933409ced92;p=karo-tx-linux.git Merge branches 'amba', 'fixes', 'gpio', 'io' (early part), 'p2v', 'pgt' and 'pm' into for-next --- e81a5597570deb83c9aefeb46ea8f933409ced92 diff --cc arch/arm/Kconfig index 3269576dbfa8,2c71a8f3535a,05589e85c180,2c71a8f3535a,272eadc7a12c,5ebc5d922ea1,3269576dbfa8..824c469c5537 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@@@@@@ -195,7 -195,8 -195,8 -195,8 -195,8 -195,7 -195,7 +195,8 @@@@@@@@ config VECTORS_BAS The base address of exception vectors. config ARM_PATCH_PHYS_VIRT - -- bool "Patch physical to virtual translations at runtime" --- bool "Patch physical to virtual translations at runtime (EXPERIMENTAL)" --- depends on EXPERIMENTAL ++++ ++ bool "Patch physical to virtual translations at runtime" if EMBEDDED ++++ ++ default y depends on !XIP_KERNEL && MMU depends on !ARCH_REALVIEW || !SPARSEMEM help