Commit 7312b740 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "serial: core: Fix ifdef for serial base console functions"

This reverts commit b20172ca.

Let's roll back all of the serial core and printk console changes that
went into 6.10-rc1 as there still are problems with them that need to be
sorted out.

Link: https://lore.kernel.org/r/ZnpRozsdw6zbjqze@tlindgre-MOBL1Reported-by: default avatarPetr Mladek <pmladek@suse.com>
Reported-by: default avatarTony Lindgren <tony@atomide.com>
Cc: Jiri Slaby <jirislaby@kernel.org>
Cc: John Ogness <john.ogness@linutronix.de>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea55c65d
...@@ -219,6 +219,8 @@ static int serial_base_add_one_prefcon(const char *match, const char *dev_name, ...@@ -219,6 +219,8 @@ static int serial_base_add_one_prefcon(const char *match, const char *dev_name,
return ret; return ret;
} }
#endif
#ifdef __sparc__ #ifdef __sparc__
/* Handle Sparc ttya and ttyb options as done in console_setup() */ /* Handle Sparc ttya and ttyb options as done in console_setup() */
...@@ -317,8 +319,6 @@ int serial_base_add_preferred_console(struct uart_driver *drv, ...@@ -317,8 +319,6 @@ int serial_base_add_preferred_console(struct uart_driver *drv,
return serial_base_add_one_prefcon(port_match, drv->dev_name, port->line); return serial_base_add_one_prefcon(port_match, drv->dev_name, port->line);
} }
#endif
#ifdef CONFIG_SERIAL_8250_CONSOLE #ifdef CONFIG_SERIAL_8250_CONSOLE
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment