diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-28 10:41:43 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-28 10:41:43 +0000 |
| commit | a7eaf12ead9c6be5f9e856e4da633b83f8ee8cce (patch) | |
| tree | 92d83a6390817df0ffa972dec34282f5796ae76c /target/linux/adm8668/patches-3.3/a02-adm8668-network-driver-fixes.patch | |
| parent | d9edbe9c04941a4e22d562197617d0bd143db808 (diff) | |
adm8668: merge 3.3 fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31497 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm8668/patches-3.3/a02-adm8668-network-driver-fixes.patch')
| -rw-r--r-- | target/linux/adm8668/patches-3.3/a02-adm8668-network-driver-fixes.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/target/linux/adm8668/patches-3.3/a02-adm8668-network-driver-fixes.patch b/target/linux/adm8668/patches-3.3/a02-adm8668-network-driver-fixes.patch deleted file mode 100644 index 4768b37dd..000000000 --- a/target/linux/adm8668/patches-3.3/a02-adm8668-network-driver-fixes.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/arch/mips/adm8668/net_core.c -+++ b/arch/mips/adm8668/net_core.c -@@ -133,7 +133,7 @@ tulip_open(struct net_device *dev) - - tulip_init_ring (dev); - -- retval = request_irq(dev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev); -+ retval = request_irq(dev->irq, tulip_interrupt, 0, dev->name, dev); - if (retval) - goto free_ring; - -@@ -469,7 +469,7 @@ static const struct net_device_ops tulip - .ndo_tx_timeout = tulip_tx_timeout, - .ndo_stop = tulip_close, - .ndo_get_stats = tulip_get_stats, -- .ndo_set_multicast_list = set_rx_mode, -+ .ndo_set_rx_mode = set_rx_mode, - .ndo_change_mtu = eth_change_mtu, - .ndo_set_mac_address = eth_mac_addr, - .ndo_validate_addr = eth_validate_addr, -@@ -509,6 +509,7 @@ static int __devinit adm8668net_probe(st - tp->dev = dev; - tp->base_addr = ioaddr; - tp->csr0 = csr0; -+ tp->pdev = pdev; - tp->rx_ring = dma_alloc_coherent(&pdev->dev, - sizeof(struct tulip_rx_desc) * RX_RING_SIZE + - sizeof(struct tulip_tx_desc) * TX_RING_SIZE, ---- a/arch/mips/adm8668/net.h -+++ b/arch/mips/adm8668/net.h -@@ -12,6 +12,7 @@ - #define __NET_TULIP_H__ - - #include <linux/module.h> -+#include <linux/export.h> - #include <linux/slab.h> - #include <linux/init.h> - #include <linux/mii.h> -@@ -25,10 +26,10 @@ - #include <linux/delay.h> - #include <linux/etherdevice.h> - #include <linux/platform_device.h> -+#include <linux/io.h> -+#include <linux/interrupt.h> - #include <asm/unaligned.h> - #include <asm/uaccess.h> --#include <asm/io.h> --#include <asm/irq.h> - - /* undefine, or define to various debugging levels (>4 == obscene levels) */ - #define TULIP_DEBUG 1 |