Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts: drivers/net/sh_eth.c
2009-10-27 01:03:26 -07:00
parent 05423b2413 f568a926a3
commit cfadf853f6
67 changed files with 6058 additions and 415 deletions
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@ -24,6 +24,7 @@
 *
 */

+#include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@ -2990,6 +2991,7 @@ static struct of_device_id emac_match[] =
 	},
 	{},
 };
+MODULE_DEVICE_TABLE(of, emac_match);

 static struct of_platform_driver emac_driver = {
 	.name = "emac",