diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-29 06:44:43 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-29 06:44:43 -0400 |
| commit | 3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727 (patch) | |
| tree | d0f196c53d209f44190fd8a6481823b7770866e6 /arch/arm/include/asm/system_info.h | |
| parent | cbd379b10019617457bda31eb243890f4377fa3e (diff) | |
| parent | 809e660f438fc5a69bf57630a85bcd8112263f37 (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/Makefile
arch/arm/include/asm/glue-proc.h
Diffstat (limited to 'arch/arm/include/asm/system_info.h')
| -rw-r--r-- | arch/arm/include/asm/system_info.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/system_info.h b/arch/arm/include/asm/system_info.h index dfd386d0c022..720ea0320a6d 100644 --- a/arch/arm/include/asm/system_info.h +++ b/arch/arm/include/asm/system_info.h | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #define CPU_ARCH_ARMv5TEJ 7 | 11 | #define CPU_ARCH_ARMv5TEJ 7 |
| 12 | #define CPU_ARCH_ARMv6 8 | 12 | #define CPU_ARCH_ARMv6 8 |
| 13 | #define CPU_ARCH_ARMv7 9 | 13 | #define CPU_ARCH_ARMv7 9 |
| 14 | #define CPU_ARCH_ARMv7M 10 | ||
| 14 | 15 | ||
| 15 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
| 16 | 17 | ||