aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/etherdevice.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 00:24:32 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 00:24:32 -0400
commita839688362e32f01608838516036697e30618b39 (patch)
treea174d93d568ba9735b13bb6ebb5f1a36c8f56308 /include/linux/etherdevice.h
parent2fa938b8a3964c21b23d9d095091e7abc88249c5 (diff)
parent12dc2fdd3e6067f5137e4a6d8af0b1a994952f52 (diff)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/etherdevice.h')
-rw-r--r--include/linux/etherdevice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 8a2df4dfbc59..cf3847edc50f 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -25,6 +25,7 @@
25#define _LINUX_ETHERDEVICE_H 25#define _LINUX_ETHERDEVICE_H
26 26
27#include <linux/if_ether.h> 27#include <linux/if_ether.h>
28#include <linux/netdevice.h>
28#include <linux/random.h> 29#include <linux/random.h>
29 30
30#ifdef __KERNEL__ 31#ifdef __KERNEL__