projects
/
linux-flexiantxendom0-natty.git
/ blobdiff
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
[linux-flexiantxendom0-natty.git]
/
drivers
/
s390
/
net
/
qeth_l3_main.c
diff --git
a/drivers/s390/net/qeth_l3_main.c
b/drivers/s390/net/qeth_l3_main.c
index
eeeb35b
..
68d623a
100644
(file)
--- a/
drivers/s390/net/qeth_l3_main.c
+++ b/
drivers/s390/net/qeth_l3_main.c
@@
-26,8
+26,6
@@
#include <net/ip.h>
#include <net/arp.h>
-#include <asm/s390_rdev.h>
-
#include "qeth_l3.h"
#include "qeth_core_offl.h"