git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfs-for-4.15-1' of git://git.linux-nfs.org/projects/anna/linux-nfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
Makefile
diff --git
a/arch/arm/Makefile
b/arch/arm/Makefile
index 36ae4454554ce1a11cc65848c60569bf8b3e0abe..def8824fc71ca36f274b680443ec99a1eeab8c69 100644
(file)
--- a/
arch/arm/Makefile
+++ b/
arch/arm/Makefile
@@
-149,6
+149,7
@@
textofs-$(CONFIG_SA1111) := 0x00208000
endif
textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
+textofs-$(CONFIG_ARCH_MESON) := 0x00208000
textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
# Machine directory name. This list is sorted alphanumerically