summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backport/Kconfig1
-rw-r--r--backport/Makefile.kernel1
-rw-r--r--copy-list6
-rw-r--r--patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch10
4 files changed, 18 insertions, 0 deletions
diff --git a/backport/Kconfig b/backport/Kconfig
index 3103f106..2ee5064a 100644
--- a/backport/Kconfig
+++ b/backport/Kconfig
@@ -31,6 +31,7 @@ source net/bluetooth/Kconfig
source net/rfkill/Kconfig
source drivers/net/wireless/Kconfig
source drivers/net/ethernet/Kconfig
+source drivers/net/usb/Kconfig
source drivers/ssb/Kconfig
source drivers/bcma/Kconfig
diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel
index 096e80c2..e2e2f444 100644
--- a/backport/Makefile.kernel
+++ b/backport/Makefile.kernel
@@ -28,6 +28,7 @@ obj-$(CPTCFG_BT) += drivers/bluetooth/
obj-$(CPTCFG_SSB) += drivers/ssb/
obj-$(CPTCFG_BCMA) += drivers/bcma/
obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
+obj-m += drivers/net/usb/
obj-$(CPTCFG_DRM) += drivers/gpu/drm/
obj-$(CPTCFG_NFC) += net/nfc/
obj-$(CPTCFG_NFC) += drivers/nfc/
diff --git a/copy-list b/copy-list
index b49901d6..6db79a34 100644
--- a/copy-list
+++ b/copy-list
@@ -74,6 +74,12 @@ drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mac80211_hwsim.h
drivers/net/wireless/mwl8k.c
drivers/net/wireless/rndis_wlan.c
+# rndis also requires some of the USB networking
+drivers/net/usb/Makefile
+drivers/net/usb/Kconfig
+drivers/net/usb/rndis_host.c
+drivers/net/usb/cdc_ether.c
+drivers/net/usb/usbnet.c
# Bluetooth
diff --git a/patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch b/patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch
new file mode 100644
index 00000000..d5dd1161
--- /dev/null
+++ b/patches/collateral-evolutions/network/0010-disable-usb-net-asix.patch
@@ -0,0 +1,10 @@
+--- a/drivers/net/usb/Makefile
++++ b/drivers/net/usb/Makefile
+@@ -8,7 +8,6 @@ obj-$(CONFIG_USB_PEGASUS) += pegasus.o
+ obj-$(CONFIG_USB_RTL8150) += rtl8150.o
+ obj-$(CONFIG_USB_HSO) += hso.o
+ obj-$(CONFIG_USB_NET_AX8817X) += asix.o
+-asix-y := asix_devices.o asix_common.o ax88172a.o
+ obj-$(CONFIG_USB_NET_AX88179_178A) += ax88179_178a.o
+ obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o
+ obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o