From: Russell King Date: Mon, 23 May 2011 18:27:40 +0000 (+0100) Subject: Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear... X-Git-Tag: v3.0-rc1~328^2~1 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ec19628d72cff8f80220b7cedba089074ac6a599 Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus --- ec19628d72cff8f80220b7cedba089074ac6a599 diff --cc arch/arm/Kconfig index 9dd61014864b,377a7a595b08,96839d9ee35d,7fd33a337130,377a7a595b08,0c23b52ee9fb,93d595a7477a..43449305961e --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@@@@@@ -367,8 -366,7 -366,7 -372,7 -366,7 -366,7 -365,6 +373,8 @@@@@@@@ config ARCH_MX select GENERIC_CLOCKEVENTS select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP ++++++ select CLKSRC_MMIO + select HAVE_SCHED_CLOCK help Support for Freescale MXC/iMX-based family of processors @@@@@@@@ -2013,9 -2010,9 -2010,9 -2030,9 -2010,9 -1996,9 -2009,6 +2019,9 @@@@@@@@ menu "Power management options source "kernel/power/Kconfig" config ARCH_SUSPEND_POSSIBLE -- --- depends on !ARCH_S5P64X0 && !ARCH_S5P6442 ++ ++++ depends on !ARCH_S5P64X0 && !ARCH_S5P6442 && !ARCH_S5PC100 + depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \ + CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE def_bool y endmenu diff --cc arch/arm/boot/compressed/head.S index 49f5b2eaaa87,adf583cd0c35,49f5b2eaaa87,ae7ecc286e7a,adf583cd0c35,adf583cd0c35,84ac4d656310..6fdf4abb718b --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@@@@@@@ -664,7 -652,7 -664,7 -662,13 -652,7 -652,7 -660,7 +674,13 @@@@@@@@ proc_types W(b) __armv4_mpu_cache_on W(b) __armv4_mpu_cache_off W(b) __armv4_mpu_cache_flush + + +++ +++ .word 0x41069260 @ ARM926EJ-S (v5TEJ) +++ +++ .word 0xff0ffff0 +++ +++ b __arm926ejs_mmu_cache_on +++ +++ b __armv4_mmu_cache_off +++ +++ b __armv5tej_mmu_cache_flush + +++ .word 0x00007000 @ ARM7 IDs .word 0x0000f000 mov pc, lr