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: (48 commits) net: Fix wrong interpretation of some copy_to_user() results. xfrm: alg_key_len & alg_icv_len should be unsigned [netdrvr] tehuti: move ioctl perm check closer to function start ipv6: Fix typo in net/ipv6/Kconfig via-velocity: fix vlan receipt tg3: sparse cleanup forcedeth: realtek phy crossover detection ibm_newemac: Increase MDIO timeouts gianfar: Fix skb allocation strategy netxen: reduce stack usage of netxen_nic_flash_print smc911x: test after postfix decrement fails in smc911x_{reset,drop_pkt} net drivers: fix platform driver hotplug/coldplug forcedeth: new backoff implementation ehea: make things static phylib: Add support for board-level PHY fixups [netdrvr] atlx: code movement: move atl1 parameter parsing atlx: remove flash vendor parameter korina: misc cleanup korina: fix misplaced return statement WAN: Fix confusing insmod error code for C101 too. ...
This commit is contained in:
@@ -1248,3 +1248,4 @@ module_exit(at91ether_exit)
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("AT91RM9200 EMAC Ethernet driver");
|
||||
MODULE_AUTHOR("Andrew Victor");
|
||||
MODULE_ALIAS("platform:" DRV_NAME);
|
||||
|
@@ -897,6 +897,7 @@ static struct platform_driver ep93xx_eth_driver = {
|
||||
.remove = ep93xx_eth_remove,
|
||||
.driver = {
|
||||
.name = "ep93xx-eth",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -914,3 +915,4 @@ static void __exit ep93xx_eth_cleanup_module(void)
|
||||
module_init(ep93xx_eth_init_module);
|
||||
module_exit(ep93xx_eth_cleanup_module);
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS("platform:ep93xx-eth");
|
||||
|
Reference in New Issue
Block a user