summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/mach
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-09-26 09:36:36 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-09-26 09:36:36 +0100
commitc825dda905bac330c2da7fabdf5c0ac28758b3cd (patch)
tree597fe4f90c49f784a0dbf1596c027880747210ec /arch/arm/include/asm/mach
parentb0a37dca72a05b7b579f288d8a67afeed96bffa5 (diff)
parent8fb54284ba6aa1f0d832ec015fde64ecf4bb0f4f (diff)
Merge branch 'for_3_2/for-rmk/arm_cpu_pm' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into devel-stable
Diffstat (limited to 'arch/arm/include/asm/mach')
-rw-r--r--arch/arm/include/asm/mach/map.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index d2fedb5aeb1..b36f3654bf5 100644
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -29,6 +29,7 @@ struct map_desc {
#define MT_MEMORY_NONCACHED 11
#define MT_MEMORY_DTCM 12
#define MT_MEMORY_ITCM 13
+#define MT_MEMORY_SO 14
#ifdef CONFIG_MMU
extern void iotable_init(struct map_desc *, int);