diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/ethernet/eth.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/ethernet/eth.c')
| -rw-r--r-- | net/ethernet/eth.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 766a0b59c0d3..7391f55904d1 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <linux/module.h> | 40 | #include <linux/module.h> |
| 41 | #include <linux/types.h> | 41 | #include <linux/types.h> |
| 42 | #include <linux/kernel.h> | 42 | #include <linux/kernel.h> |
| 43 | #include <linux/sched.h> | ||
| 44 | #include <linux/string.h> | 43 | #include <linux/string.h> |
| 45 | #include <linux/mm.h> | 44 | #include <linux/mm.h> |
| 46 | #include <linux/socket.h> | 45 | #include <linux/socket.h> |