Commit 9ddfeb2f authored by Jiri Slaby's avatar Jiri Slaby Committed by Zhang Xiaoxu
Browse files

tty: ipwireless: move Kconfig entry to tty 

mainline inclusion
from mainline-v6.4-rc1
commit 3996954f
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: default avatarJiri 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: default avatarDavid Sterba <dsterba@suse.com>
Link: https://lore.kernel.org/r/20230222092302.6348-1-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Conflicts:
	drivers/tty/Kconfig

Signed-off-by: default avatarZhang Xiaoxu <zhangxiaoxu5@huawei.com>
parent 81311949

drivers/char/pcmcia/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -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

drivers/tty/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -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