Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.

2005-06-30 00:49:18 -04:00
parent 9bd481f859 9b4311eedb
commit 0c16877570
308 changed files with 4410 additions and 4650 deletions
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -25,6 +25,7 @@
 #define _LINUX_ETHERDEVICE_H

 #include <linux/if_ether.h>
+#include <linux/netdevice.h>
 #include <linux/random.h>

 #ifdef __KERNEL__