git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[safe/jmp/linux-2.6]
/
drivers
/
s390
/
net
/
qeth_l2_main.c
diff --git
a/drivers/s390/net/qeth_l2_main.c
b/drivers/s390/net/qeth_l2_main.c
index
e873d45
..
c4f1b04
100644
(file)
--- a/
drivers/s390/net/qeth_l2_main.c
+++ b/
drivers/s390/net/qeth_l2_main.c
@@
-20,8
+20,6
@@
#include <linux/mii.h>
#include <linux/ip.h>
-#include <asm/s390_rdev.h>
-
#include "qeth_core.h"
#include "qeth_core_offl.h"