Merge branch 'viro'

2006-02-09 14:17:05 -05:00
parent 5d1769ac3d 2746b8623a
commit 70c07e0262
342 changed files with 4979 additions and 2177 deletions
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -32,6 +32,8 @@
 */
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
+#include <linux/in.h>
+#include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/etherdevice.h>