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

Commit a9cdffb1 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds
Browse files

[PATCH] m68knommu: compile fixes for mcfserial.c 



Re-organize the default CONSOLE baud rate define setting so that
it is only set once.

Use the new tty_schedule_flip() instead of the original direct
schedule_work of the flip buffer.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2da436e0

drivers/serial/mcfserial.c

+6 −10
Original line number Diff line number Diff line
@@ -57,20 +57,16 @@ struct timer_list mcfrs_timer_struct; 
 *	keep going.  Perhaps one day the cflag settings for the

 *	console can be used instead.

 */

#if defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \

    defined(CONFIG_senTec) || defined(CONFIG_SNEHA)

#define	CONSOLE_BAUD_RATE	19200

#define	DEFAULT_CBAUD		B19200

#endif



#if defined(CONFIG_HW_FEITH)

#define	CONSOLE_BAUD_RATE	38400

#define	DEFAULT_CBAUD		B38400

#endif



#if defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB)

#elif defined(CONFIG_MOD5272) || defined(CONFIG_M5208EVB)

#define CONSOLE_BAUD_RATE 	115200

#define DEFAULT_CBAUD		B115200

#elif defined(CONFIG_ARNEWSH) || defined(CONFIG_FREESCALE) || \

      defined(CONFIG_senTec) || defined(CONFIG_SNEHA)

#define	CONSOLE_BAUD_RATE	19200

#define	DEFAULT_CBAUD		B19200

#endif



#ifndef CONSOLE_BAUD_RATE
@@ -350,7 +346,7 @@ static inline void receive_chars(struct mcf_serial *info) 
		}

		tty_insert_flip_char(tty, ch, flag);

	}

	tty_flip_buffer_push(tty);

	tty_schedule_flip(tty);

	return;

}