Merge branch 'master' into phcoder/scratch

This commit is contained in:
Vladimir Serbinenko committed 2013-12-23 04:16:55 +01:00
commit 1d83f4d467
10 files changed
+639 -15

No files matched your search

+1 -3
View File
@@ -259,15 +259,13 @@ grub_arm_disable_caches_mmu (void)
probe_caches ();
switch (type)
{
case ARCH_ARMV5_WRITE_THROUGH:
case ARCH_ARMV6_UNIFIED:
case ARCH_ARMV6:
grub_arm_disable_caches_mmu_armv6 ();
break;
case ARCH_ARMV7:
grub_arm_disable_caches_mmu_armv7 ();
break;
/* Nothing to do. */
case ARCH_ARMV5_WRITE_THROUGH:
break;
/* Pacify GCC. */
case ARCH_UNKNOWN: