git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
fs_enet
/
mac-scc.c
diff --git
a/drivers/net/fs_enet/mac-scc.c
b/drivers/net/fs_enet/mac-scc.c
index afd7fca7c6c419290b628bdc6a7cda98784f1e4c..65925b5a224f761afdb169762e376f7d4c3890a0 100644
(file)
--- a/
drivers/net/fs_enet/mac-scc.c
+++ b/
drivers/net/fs_enet/mac-scc.c
@@
-15,7
+15,6
@@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
-#include <linux/sched.h>
#include <linux/string.h>
#include <linux/ptrace.h>
#include <linux/errno.h>