Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb740f9b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-4.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 

Pull serial driver fix from Greg KH:
 "Here is one serial driver fix for 4.3-rc3 that resolves a module
  loading issue due to splitting up of the 8250 driver into smaller
  pieces.  It's been in linux-next with no reported problems"

* tag 'tty-4.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: serial: Add missing module license for 8250_base.ko
parents b11e7b81 f7a7651f

drivers/tty/serial/8250/8250_port.c

+2 −0
Original line number Diff line number Diff line
@@ -2910,3 +2910,5 @@ int serial8250_console_setup(struct uart_port *port, char *options, bool probe) 
}



#endif /* CONFIG_SERIAL_8250_CONSOLE */



MODULE_LICENSE("GPL");