Commit 86b9602f authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

serial: pic32: make SERIAL_PIC32_CONSOLE depend on SERIAL_PIC32=y

pic32_uart contains this:
  #ifdef CONFIG_SERIAL_PIC32_CONSOLE
  ...
  console_initcall(pic32_console_init);
  ...
  core_initcall(pic32_late_console_init);
  ...
  #endif
  ...
  arch_initcall(pic32_uart_init);

When the driver is built as module, all three above become
module_init(). So if SERIAL_PIC32_CONSOLE is set while SERIAL_PIC32=m,
it results in the following build error:
  In file included from include/linux/device/driver.h:21,
                   from include/linux/device.h:32,
                   from include/linux/platform_device.h:13,
                   from drivers/tty/serial/pic32_uart.c:12:
  include/linux/module.h:131:49: error: redefinition of '__inittest'

So make sure SERIAL_PIC32_CONSOLE can be set only when SERIAL_PIC32=y --
similar as for other drivers.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220421101708.5640-7-jslaby@suse.czSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d2b574c0
...@@ -818,7 +818,7 @@ config SERIAL_PIC32 ...@@ -818,7 +818,7 @@ config SERIAL_PIC32
config SERIAL_PIC32_CONSOLE config SERIAL_PIC32_CONSOLE
bool "PIC32 serial console support" bool "PIC32 serial console support"
depends on SERIAL_PIC32 depends on SERIAL_PIC32=y
select SERIAL_CORE_CONSOLE select SERIAL_CORE_CONSOLE
help help
If you have a PIC32, this driver supports the putting a console on one If you have a PIC32, this driver supports the putting a console on one
......
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