tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
netxen: include ipv6.h (fixes build failure)
netxen: avoid invalid iounmap

Linus Torvalds abcea859 4b48d9d4

+5 -2
+5 -2
drivers/net/netxen/netxen_nic_main.c
··· 41 41 #include <linux/dma-mapping.h> 42 42 #include <linux/if_vlan.h> 43 43 #include <net/ip.h> 44 + #include <linux/ipv6.h> 44 45 45 46 MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver"); 46 47 MODULE_LICENSE("GPL"); ··· 1005 1004 1006 1005 iounmap(adapter->ahw.db_base); 1007 1006 iounmap(adapter->ahw.pci_base0); 1008 - iounmap(adapter->ahw.pci_base1); 1009 - iounmap(adapter->ahw.pci_base2); 1007 + if (adapter->ahw.pci_base1 != NULL) 1008 + iounmap(adapter->ahw.pci_base1); 1009 + if (adapter->ahw.pci_base2 != NULL) 1010 + iounmap(adapter->ahw.pci_base2); 1010 1011 1011 1012 pci_release_regions(pdev); 1012 1013 pci_disable_device(pdev);