aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2016-02-15 03:31:59 +0000
committerBen Hutchings <ben@decadent.org.uk>2016-02-15 03:33:03 +0000
commit306abaa161196d4903405181cf80b84daa9064d0 (patch)
treeff0c7cf07384c84163580c0b76d683e550a6d76c
parentc66e31d10c64c15bb21d584f20087c121a30b4b5 (diff)
downloadkernel_replicant_linux-306abaa161196d4903405181cf80b84daa9064d0.tar.gz
kernel_replicant_linux-306abaa161196d4903405181cf80b84daa9064d0.tar.bz2
kernel_replicant_linux-306abaa161196d4903405181cf80b84daa9064d0.zip
udeb: Move most USB wireless drivers from nic-usb-modules to nic-wireless-modules
-rw-r--r--debian/changelog2
-rw-r--r--debian/installer/modules/nic-usb-modules5
-rw-r--r--debian/installer/modules/nic-wireless-modules3
3 files changed, 2 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 6a9f0b7940ab..ba1468cb3270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ linux (4.4.1-1) UNRELEASED; urgency=medium
* udeb: Remove some obsolete drivers:
- nic-modules: Remove FDDI and HIPPI drivers, and inet_lro module
- nic-pcmcia-modules: Remove Arcnet drivers
+ * udeb: Move most USB wireless drivers from nic-usb-modules to
+ nic-wireless-modules
[ Roger Shimizu ]
* Enable TTY_PRINTK as module (Closes: #814540).
diff --git a/debian/installer/modules/nic-usb-modules b/debian/installer/modules/nic-usb-modules
index 56226e3e56ca..61f9f361df0d 100644
--- a/debian/installer/modules/nic-usb-modules
+++ b/debian/installer/modules/nic-usb-modules
@@ -4,11 +4,6 @@ drivers/net/usb/*
# Include rndis_wlan, which depends on rndis_host
rndis_wlan
-# Include some other wireless drivers (for no discernable reason)
-rtl8187
-zd1201
-zd1211rw
-
# Exclude wireless modem drivers which need extra configuration
cdc_mbim -
cdc_ncm -
diff --git a/debian/installer/modules/nic-wireless-modules b/debian/installer/modules/nic-wireless-modules
index b03324f7ceee..ec7532b71833 100644
--- a/debian/installer/modules/nic-wireless-modules
+++ b/debian/installer/modules/nic-wireless-modules
@@ -17,9 +17,6 @@ spectrum_cs ?
# Exclude drivers packaged in nic-usb-modules
rndis_wlan -
-rtl8187 -
-zd1201 -
-zd1211rw -
# Exclude debug driver
mac80211_hwsim -