1 files changed, 5 insertions, 6 deletions

diff --git a/arch/hexagon/include/asm/vm_mmu.h b/arch/hexagon/include/asm/vm_mmu.h
index 9a94de7969bb..096537d8f4c5 100644
--- a/arch/hexagon/include/asm/vm_mmu.h
+++ b/arch/hexagon/include/asm/vm_mmu.h
@@ -1,7 +1,7 @@
 /*
  * Hexagon VM page table entry definitions
  *
- * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2011,2013 The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -68,14 +68,13 @@
 
 #define __HEXAGON_C_WB          0x0     /* Write-back, no L2 */
 #define __HEXAGON_C_WT          0x1     /* Write-through, no L2 */
+#define __HEXAGON_C_UNC         0x6     /* Uncached memory */
+#if CONFIG_HEXAGON_ARCH_VERSION >= 2
 #define __HEXAGON_C_DEV         0x4     /* Device register space */
-#define __HEXAGON_C_WT_L2       0x5     /* Write-through, with L2 */
-/* this really should be #if CONFIG_HEXAGON_ARCH = 2 but that's not defined */
-#if defined(CONFIG_HEXAGON_COMET) || defined(CONFIG_QDSP6_ST1)
-#define __HEXAGON_C_UNC         __HEXAGON_C_DEV
 #else
-#define __HEXAGON_C_UNC         0x6     /* Uncached memory */
+#define __HEXAGON_C_DEV         __HEXAGON_C_UNC
 #endif
+#define __HEXAGON_C_WT_L2       0x5     /* Write-through, with L2 */
 #define __HEXAGON_C_WB_L2       0x7     /* Write-back, with L2 */
 
 /*