[PATCH 35/47] backports: Remove prism54 driver

Hauke Mehrtens <[email protected]>
Newsgroups org.kernel.vger.backports
Message-ID <[email protected]>
This driver was removed from upstream kernel.

Signed-off-by: Hauke Mehrtens <[email protected]>
---
 backport/defconfigs/wifi                  |  1 -
 patches/0094-ndo-tx-timeout/prism54.patch | 23 -----------------------
 2 files changed, 24 deletions(-)
 delete mode 100644 patches/0094-ndo-tx-timeout/prism54.patch

diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi
index 86e3bd6e..ea0aee71 100644
--- a/backport/defconfigs/wifi
+++ b/backport/defconfigs/wifi
@@ -76,7 +76,6 @@ CPTCFG_P54_COMMON=m
 CPTCFG_P54_PCI=m
 CPTCFG_P54_SPI=m
 CPTCFG_P54_USB=m
-CPTCFG_PRISM54=m
 CPTCFG_PCI_ATMEL=m
 CPTCFG_PCI_HERMES=m
 CPTCFG_PCMCIA_ATMEL=m
diff --git a/patches/0094-ndo-tx-timeout/prism54.patch b/patches/0094-ndo-tx-timeout/prism54.patch
deleted file mode 100644
index 1e55f03c..00000000
--- a/patches/0094-ndo-tx-timeout/prism54.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/wireless/intersil/prism54/islpci_eth.h
-+++ b/drivers/net/wireless/intersil/prism54/islpci_eth.h
-@@ -54,6 +54,7 @@ void islpci_eth_cleanup_transmit(islpci_
- netdev_tx_t islpci_eth_transmit(struct sk_buff *, struct net_device *);
- int islpci_eth_receive(islpci_private *);
- void islpci_eth_tx_timeout(struct net_device *, unsigned int txqueue);
-+void bp_islpci_eth_tx_timeout(struct net_device *);
- void islpci_do_reset_and_wake(struct work_struct *);
- 
- #endif				/* _ISL_GEN_H */
---- a/drivers/net/wireless/intersil/prism54/islpci_eth.c
-+++ b/drivers/net/wireless/intersil/prism54/islpci_eth.c
-@@ -487,3 +487,10 @@ islpci_eth_tx_timeout(struct net_device
- 			"%s: tx_timeout, waiting for reset", ndev->name);
- 	}
- }
-+
-+#if LINUX_VERSION_IS_LESS(5,6,0)
-+void bp_islpci_eth_tx_timeout(struct net_device *dev) {
-+	islpci_eth_tx_timeout(dev, 0);
-+}
-+EXPORT_SYMBOL_GPL(bp_islpci_eth_tx_timeout);
-+#endif
-- 
2.30.2

--
To unsubscribe from this list: send the line "unsubscribe backports" in
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.