aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/config/ia64/config31
2 files changed, 1 insertions, 31 deletions
diff --git a/debian/changelog b/debian/changelog
index 22ed30f5f975..b38e1bf8085f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ linux (4.16~rc5-1~exp2) UNRELEASED; urgency=medium
(fixes FTBFS on some architectures)
* [ia64] Re-add configuration for kernel and udebs:
- Revert "Remove all support for ia64" (Closes: #886693)
+ - Disable IRDA, consistent with other architectures
-- Ben Hutchings <ben@decadent.org.uk> Tue, 13 Mar 2018 16:12:54 +0000
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index 3004ad52b3a3..4828b51639a3 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -654,37 +654,6 @@ CONFIG_PCMCIA_SYM53C500=m
CONFIG_SGI_IOC3=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_ULTRA=y
-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/staging/wlan-ng/Kconfig
##
# CONFIG_PRISM2_USB is not set