From: Jiri Slaby jirislaby@kernel.org
mainline inclusion from mainline-v6.4-rc1 commit 3996954fa071aa20945c8ac7694684fa3c1fed68 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5YGNO CVE: CVE-2022-44033
-------------------------------------------------
The ipwireless' Kconfig entry is currently sitting in char/pcmcia. But the driver is in tty/. So move the entry to tty/ too.
First, it makes sense to have the entry along the driver. Second, whole char/pcmcia is about to pass away.
Signed-off-by: Jiri Slaby (SUSE) jirislaby@kernel.org Cc: Jiri Kosina jikos@kernel.org Cc: David Sterba dsterba@suse.com Cc: Arnd Bergmann arnd@arndb.de Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org Acked-by: David Sterba dsterba@suse.com Link: https://lore.kernel.org/r/20230222092302.6348-1-jirislaby@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
Conflicts: drivers/tty/Kconfig
Signed-off-by: Zhang Xiaoxu zhangxiaoxu5@huawei.com --- drivers/char/pcmcia/Kconfig | 9 --------- drivers/tty/Kconfig | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig index 1d1e7da8ad27..df2f3529822a 100644 --- a/drivers/char/pcmcia/Kconfig +++ b/drivers/char/pcmcia/Kconfig @@ -54,14 +54,5 @@ config SCR24X
If unsure say N.
-config IPWIRELESS - tristate "IPWireless 3G UMTS PCMCIA card support" - depends on PCMCIA && NETDEVICES && TTY - select PPP - help - This is a driver for 3G UMTS PCMCIA card from IPWireless company. In - some countries (for example Czech Republic, T-Mobile ISP) this card - is shipped for service called UMTS 4G. - endmenu
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig index e0a04bfc873e..dcfd593d0b2b 100644 --- a/drivers/tty/Kconfig +++ b/drivers/tty/Kconfig @@ -389,6 +389,15 @@ config GOLDFISH_TTY_EARLY_CONSOLE default y if GOLDFISH_TTY=y select SERIAL_EARLYCON
+config IPWIRELESS + tristate "IPWireless 3G UMTS PCMCIA card support" + depends on PCMCIA && NETDEVICES + select PPP + help + This is a driver for 3G UMTS PCMCIA card from IPWireless company. In + some countries (for example Czech Republic, T-Mobile ISP) this card + is shipped for service called UMTS 4G. + config MIPS_EJTAG_FDC_TTY bool "MIPS EJTAG Fast Debug Channel TTY" depends on MIPS_CDMM