Skip to content

Commit

Permalink
serial: core: Fix ifdef for serial base console functions
Browse files Browse the repository at this point in the history
If CONFIG_SERIAL_CORE_CONSOLE is not set, we get build errors.
Let's fix the issue by moving the endif after the serial base console
functions.

Fixes: 4547cd7 ("serial: 8250: Fix add preferred console for serial8250_isa_init_ports()")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202404131416.VJljwvkS-lkp@intel.com/
Signed-off-by: Tony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20240413103343.24231-1-tony@atomide.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Tony Lindgren authored and Greg Kroah-Hartman committed Apr 13, 2024
1 parent 1b74348 commit b20172c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/tty/serial/serial_base_bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,6 @@ static int serial_base_add_one_prefcon(const char *match, const char *dev_name,
return ret;
}

#endif

#ifdef __sparc__

/* Handle Sparc ttya and ttyb options as done in console_setup() */
Expand Down Expand Up @@ -319,6 +317,8 @@ int serial_base_add_preferred_console(struct uart_driver *drv,
return serial_base_add_one_prefcon(port_match, drv->dev_name, port->line);
}

#endif

#ifdef CONFIG_SERIAL_8250_CONSOLE

/*
Expand Down

0 comments on commit b20172c

Please sign in to comment.