[linux] 03/03: udeb: Move most USB wireless drivers from nic-usb-modules to nic-wireless-modules

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 306abaa161196d4903405181cf80b84daa9064d0
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Feb 15 03:31:59 2016 +0000

    udeb: Move most USB wireless drivers from nic-usb-modules to nic-wireless-modules
---
 debian/changelog                              | 2 ++
 debian/installer/modules/nic-usb-modules      | 5 -----
 debian/installer/modules/nic-wireless-modules | 3 ---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a9f0b7..ba1468c 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 56226e3..61f9f36 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 b03324f..ec7532b 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 -

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git