mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
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-----
Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris
Pull CRIS updates from Jesper Nilsson:
"Three patches for minor issues"
* tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
cris: No need to append -O2 and $(LINUXINCLUDE)
tty: serial: make crisv10 explicitly non-modular
cris: Only build flash rescue image if CONFIG_ETRAX_AXISFLASHMAP is selected
This commit is contained in:
commit
8fa3b6f939
3 changed files with 9 additions and 9 deletions
|
|
@ -28,7 +28,6 @@ static char *serial_version = "$Revision: 1.25 $";
|
|||
#include <linux/bitops.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
|
|
@ -4098,7 +4097,7 @@ static void show_serial_version(void)
|
|||
&serial_version[11]); /* "$Revision: x.yy" */
|
||||
}
|
||||
|
||||
/* rs_init inits the driver at boot (using the module_init chain) */
|
||||
/* rs_init inits the driver at boot (using the initcall chain) */
|
||||
|
||||
static const struct tty_operations rs_ops = {
|
||||
.open = rs_open,
|
||||
|
|
@ -4247,5 +4246,4 @@ static int __init rs_init(void)
|
|||
}
|
||||
|
||||
/* this makes sure that rs_init is called during kernel boot */
|
||||
|
||||
module_init(rs_init);
|
||||
device_initcall(rs_init);
|
||||
|
|
|
|||
Loading…
Reference in a new issue