cris-for-4.10

Three patches for minor issues:

Guenter Roeck (1):
      cris: Only build flash rescue image if CONFIG_ETRAX_AXISFLASHMAP is selected

Paul Bolle (1):
      cris: No need to append -O2 and $(LINUXINCLUDE)

Paul Gortmaker (1):
      tty: serial: make crisv10 explicitly non-modular

 arch/cris/boot/compressed/Makefile |    3 ---
 arch/cris/boot/rescue/Makefile     |    9 +++++++--
 drivers/tty/serial/crisv10.c       |    6 ++----
 3 files changed, 9 insertions(+), 9 deletions(-)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAlhJbl0ACgkQ31LbvUHyf1cK3QCfTFKWF21o02/H8ZFby6oa7Jgp
X4kAn0+rFwV0CtJ3JQum49DsHZf/M72+
=iH+I
-----END PGP SIGNATURE-----