Merge branch 'upstream' (54da9a39) · Commits · e / devices / android_kernel_fairphone_FP3

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 16
		EXTRAVERSION =-rc5
		EXTRAVERSION =-rc6
		NAME=Sliding Snow Leopard

		# DOCUMENTATION

drivers/net/3c509.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -1574,6 +1574,7 @@ MODULE_LICENSE("GPL");

		static int __init el3_init_module(void)
		{
		int ret = 0;
		el3_cards = 0;

		if (debug >= 0)
		@@ -1589,14 +1590,16 @@ static int __init el3_init_module(void)
		}

		#ifdef CONFIG_EISA
		if (eisa_driver_register (&el3_eisa_driver) < 0) {
		eisa_driver_unregister (&el3_eisa_driver);
		}
		ret = eisa_driver_register(&el3_eisa_driver);
		#endif
		#ifdef CONFIG_MCA
		mca_register_driver(&el3_mca_driver);
		{
		int err = mca_register_driver(&el3_mca_driver);
		if (ret == 0)
		ret = err;
		}
		#endif
		return 0;
		return ret;
		}

		static void __exit el3_cleanup_module(void)

drivers/net/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -1087,7 +1087,8 @@ config NE2000
		without a specific driver are compatible with NE2000.

		If you have a PCI NE2000 card however, say N here and Y to "PCI
		NE2000 support", above. If you have a NE2000 card and are running on
		NE2000 and clone support" under "EISA, VLB, PCI and on board
		controllers" below. If you have a NE2000 card and are running on
		an MCA system (a bus system used on some IBM PS/2 computers and
		laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
		below.

drivers/net/de620.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1012,7 +1012,7 @@ static int __init read_eeprom(struct net_device *dev)
		#ifdef MODULE
		static struct net_device *de620_dev;

		int init_module(void)
		int __init init_module(void)
		{
		de620_dev = de620_probe(-1);
		if (IS_ERR(de620_dev))

drivers/net/dl2k.c

+15 −10

Original line number	Diff line number	Diff line
		@@ -50,8 +50,8 @@

		*/
		#define DRV_NAME "D-Link DL2000-based linux driver"
		#define DRV_VERSION "v1.17a"
		#define DRV_RELDATE "2002/10/04"
		#define DRV_VERSION "v1.17b"
		#define DRV_RELDATE "2006/03/10"
		#include "dl2k.h"

		static char version[] __devinitdata =
		@@ -765,7 +765,7 @@ rio_free_tx (struct net_device *dev, int irq)
		break;
		skb = np->tx_skbuff[entry];
		pci_unmap_single (np->pdev,
		np->tx_ring[entry].fraginfo,
		np->tx_ring[entry].fraginfo & 0xffffffffffff,
		skb->len, PCI_DMA_TODEVICE);
		if (irq)
		dev_kfree_skb_irq (skb);
		@@ -892,14 +892,16 @@ receive_packet (struct net_device *dev)

		/* Small skbuffs for short packets */
		if (pkt_len > copy_thresh) {
		pci_unmap_single (np->pdev, desc->fraginfo,
		pci_unmap_single (np->pdev,
		desc->fraginfo & 0xffffffffffff,
		np->rx_buf_sz,
		PCI_DMA_FROMDEVICE);
		skb_put (skb = np->rx_skbuff[entry], pkt_len);
		np->rx_skbuff[entry] = NULL;
		} else if ((skb = dev_alloc_skb (pkt_len + 2)) != NULL) {
		pci_dma_sync_single_for_cpu(np->pdev,
		desc->fraginfo,
		desc->fraginfo &
		0xffffffffffff,
		np->rx_buf_sz,
		PCI_DMA_FROMDEVICE);
		skb->dev = dev;
		@@ -910,7 +912,8 @@ receive_packet (struct net_device *dev)
		pkt_len, 0);
		skb_put (skb, pkt_len);
		pci_dma_sync_single_for_device(np->pdev,
		desc->fraginfo,
		desc->fraginfo &
		0xffffffffffff,
		np->rx_buf_sz,
		PCI_DMA_FROMDEVICE);
		}
		@@ -1796,7 +1799,8 @@ rio_close (struct net_device *dev)
		np->rx_ring[i].fraginfo = 0;
		skb = np->rx_skbuff[i];
		if (skb) {
		pci_unmap_single (np->pdev, np->rx_ring[i].fraginfo,
		pci_unmap_single(np->pdev,
		np->rx_ring[i].fraginfo & 0xffffffffffff,
		skb->len, PCI_DMA_FROMDEVICE);
		dev_kfree_skb (skb);
		np->rx_skbuff[i] = NULL;
		@@ -1805,7 +1809,8 @@ rio_close (struct net_device *dev)
		for (i = 0; i < TX_RING_SIZE; i++) {
		skb = np->tx_skbuff[i];
		if (skb) {
		pci_unmap_single (np->pdev, np->tx_ring[i].fraginfo,
		pci_unmap_single(np->pdev,
		np->tx_ring[i].fraginfo & 0xffffffffffff,
		skb->len, PCI_DMA_TODEVICE);
		dev_kfree_skb (skb);
		np->tx_skbuff[i] = NULL;