From d12b3a11b2800489cde0be2d74872af04b5b8f36 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 4 Oct 2017 02:30:29 +0100 Subject: [PATCH] net: Disable IRDA, which will soon be deleted upstream --- debian/changelog | 1 + debian/config/alpha/config | 37 -------------------- debian/config/config | 18 ++-------- debian/config/i386/config | 5 --- debian/config/kernelarch-mips/config.malta | 30 ----------------- debian/config/kernelarch-powerpc/config | 39 ---------------------- debian/config/kernelarch-sparc/config | 5 --- debian/config/kernelarch-x86/config | 37 -------------------- debian/config/m68k/config | 5 --- 9 files changed, 3 insertions(+), 174 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9c5ed14a3..c39e73860 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ linux (4.14~rc3-1~exp2) UNRELEASED; urgency=medium - Change RC_CORE back to being a module - power/supply: Enable BATTERY_BQ27XXX and BATTERY_BQ27XXX_HDQ as modules, replacing W1_SLAVE_BQ27000 + * net: Disable IRDA, which will soon be deleted upstream -- Ben Hutchings Wed, 04 Oct 2017 01:44:24 +0100 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 2c1660c16..9ef23118b 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -796,43 +796,6 @@ CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m -## -## file: drivers/staging/irda/drivers/Kconfig -## -CONFIG_IRTTY_SIR=m -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m - -## -## file: drivers/staging/irda/net/Kconfig -## -CONFIG_IRDA=m -CONFIG_IRDA_ULTRA=y -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -## -## file: drivers/staging/irda/net/ircomm/Kconfig -## -CONFIG_IRCOMM=m - -## -## file: drivers/staging/irda/net/irlan/Kconfig -## -CONFIG_IRLAN=m - -## -## file: drivers/staging/irda/net/irnet/Kconfig -## -CONFIG_IRNET=m - ## ## file: drivers/tty/Kconfig ## diff --git a/debian/config/config b/debian/config/config index b87cc4c19..409c83157 100644 --- a/debian/config/config +++ b/debian/config/config @@ -4548,23 +4548,9 @@ CONFIG_STAGING=y # CONFIG_AD2S1210 is not set ## -## file: drivers/staging/irda/drivers/Kconfig +## file: drivers/staging/irda/net/Kconfig ## -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m -CONFIG_KINGSUN_DONGLE=m -CONFIG_KSDAZZLE_DONGLE=m -CONFIG_KS959_DONGLE=m -CONFIG_MCS_FIR=m +# CONFIG_IRDA is not set ## ## file: drivers/staging/lustre/lustre/Kconfig diff --git a/debian/config/i386/config b/debian/config/i386/config index 1d3c9e0df..413ade070 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -407,11 +407,6 @@ CONFIG_COMEDI_PCMMIO=m CONFIG_COMEDI_PCMUIO=m CONFIG_COMEDI_MULTIQ3=m -## -## file: drivers/staging/irda/drivers/Kconfig -## -CONFIG_TOSHIBA_FIR=m - ## ## file: drivers/staging/olpc_dcon/Kconfig ## diff --git a/debian/config/kernelarch-mips/config.malta b/debian/config/kernelarch-mips/config.malta index a1b2da63a..5c8414bd8 100644 --- a/debian/config/kernelarch-mips/config.malta +++ b/debian/config/kernelarch-mips/config.malta @@ -344,36 +344,6 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -## -## file: drivers/staging/irda/drivers/Kconfig -## -CONFIG_IRTTY_SIR=m -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_VLSI_FIR=m - -## -## file: drivers/staging/irda/net/Kconfig -## -CONFIG_IRDA=m -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y - -## -## file: drivers/staging/irda/net/ircomm/Kconfig -## -CONFIG_IRCOMM=m - -## -## file: drivers/staging/irda/net/irlan/Kconfig -## -CONFIG_IRLAN=m - -## -## file: drivers/staging/irda/net/irnet/Kconfig -## -CONFIG_IRNET=m - ## ## file: drivers/tty/serial/Kconfig ## diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config index 6359b49a1..c328ef9cb 100644 --- a/debian/config/kernelarch-powerpc/config +++ b/debian/config/kernelarch-powerpc/config @@ -720,45 +720,6 @@ CONFIG_PCMCIA_NINJA_SCSI=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m -## -## file: drivers/staging/irda/drivers/Kconfig -## -CONFIG_IRTTY_SIR=m -# CONFIG_DONGLE is not set -CONFIG_USB_IRDA=m -# CONFIG_SIGMATEL_FIR is not set -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -# CONFIG_TOSHIBA_FIR is not set -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -# CONFIG_VLSI_FIR is not set -CONFIG_VIA_FIR=m - -## -## file: drivers/staging/irda/net/Kconfig -## -CONFIG_IRDA=m -CONFIG_IRDA_ULTRA=y -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -## -## file: drivers/staging/irda/net/ircomm/Kconfig -## -CONFIG_IRCOMM=m - -## -## file: drivers/staging/irda/net/irlan/Kconfig -## -CONFIG_IRLAN=m - -## -## file: drivers/staging/irda/net/irnet/Kconfig -## -CONFIG_IRNET=m - ## ## file: drivers/tty/Kconfig ## diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config index db8a0e348..dc855ff32 100644 --- a/debian/config/kernelarch-sparc/config +++ b/debian/config/kernelarch-sparc/config @@ -425,11 +425,6 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -## -## file: drivers/staging/irda/net/Kconfig -## -# CONFIG_IRDA is not set - ## ## file: drivers/tty/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index a4b724a05..4572b6ce7 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1570,43 +1570,6 @@ CONFIG_COMEDI_VMK80XX=m CONFIG_COMEDI_8255_SA=m CONFIG_COMEDI_KCOMEDILIB=m -## -## file: drivers/staging/irda/drivers/Kconfig -## -CONFIG_IRTTY_SIR=m -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m - -## -## file: drivers/staging/irda/net/Kconfig -## -CONFIG_IRDA=m -# CONFIG_IRDA_ULTRA is not set -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -## -## file: drivers/staging/irda/net/ircomm/Kconfig -## -CONFIG_IRCOMM=m - -## -## file: drivers/staging/irda/net/irlan/Kconfig -## -CONFIG_IRLAN=m - -## -## file: drivers/staging/irda/net/irnet/Kconfig -## -CONFIG_IRNET=m - ## ## file: drivers/staging/lustre/lnet/Kconfig ## diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 3994051a2..351174cd4 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -525,11 +525,6 @@ CONFIG_BVME6000_SCSI=m ## # CONFIG_STAGING is not set -## -## file: drivers/staging/irda/net/Kconfig -## -# CONFIG_IRDA is not set - ## ## file: drivers/tty/Kconfig ##