diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-12-21 11:19:24 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-12-21 11:19:24 +0000 |
commit | 8cc9251737d1883e33fd0a7dafbd4062916c1ca6 (patch) | |
tree | 6a1901ccbce167330049ce9b2afced122b325c4a /arch/arm/include/asm/fixmap.h | |
parent | e64ab473dddaffdfc4bd0b385204f472f2cb00d6 (diff) | |
parent | 10fce53c0ef8f6e79115c3d9e0d7ea1338c3fa37 (diff) | |
download | linux-8cc9251737d1883e33fd0a7dafbd4062916c1ca6.tar.gz linux-8cc9251737d1883e33fd0a7dafbd4062916c1ca6.tar.bz2 linux-8cc9251737d1883e33fd0a7dafbd4062916c1ca6.zip |
Merge branches 'fixes' and 'misc' into for-next
Diffstat (limited to 'arch/arm/include/asm/fixmap.h')
-rw-r--r-- | arch/arm/include/asm/fixmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h index fc56fc3e1931..9575b404019c 100644 --- a/arch/arm/include/asm/fixmap.h +++ b/arch/arm/include/asm/fixmap.h @@ -2,7 +2,7 @@ #ifndef _ASM_FIXMAP_H #define _ASM_FIXMAP_H -#define FIXADDR_START 0xffc00000UL +#define FIXADDR_START 0xffc80000UL #define FIXADDR_END 0xfff00000UL #define FIXADDR_TOP (FIXADDR_END - PAGE_SIZE) |