summaryrefslogtreecommitdiff
path: root/kernel/printk/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-25 07:58:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-25 07:58:10 +0200
commitcc8d5a2f09a54405321769abfd6ec3395482336a (patch)
treed3f67f5bc10b9b8590b9b3283cf4abf01defb2c9 /kernel/printk/Makefile
parent64f9f010c6177dd4f33e5023d2eab9af4af291e9 (diff)
downloadlwn-cc8d5a2f09a54405321769abfd6ec3395482336a.tar.gz
lwn-cc8d5a2f09a54405321769abfd6ec3395482336a.zip
Revert "printk: Save console options for add_preferred_console_match()"
This reverts commit f03e8c1060f86c23eb49bafee99d9fcbd1c1bd77. 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-MOBL1 Reported-by: Petr Mladek <pmladek@suse.com> Reported-by: Tony 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/printk/Makefile')
-rw-r--r--kernel/printk/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk/Makefile b/kernel/printk/Makefile
index 040fe7d1eda2..39a2b61c7232 100644
--- a/kernel/printk/Makefile
+++ b/kernel/printk/Makefile
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-y = printk.o conopt.o
+obj-y = printk.o
obj-$(CONFIG_PRINTK) += printk_safe.o nbcon.o
obj-$(CONFIG_A11Y_BRAILLE_CONSOLE) += braille.o
obj-$(CONFIG_PRINTK_INDEX) += index.o