diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
| commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
| tree | fbdb44317130c371928154c9e6903e699fe2b995 /net/openvswitch | |
| parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/datapath.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index f5ca1257debf..f86de29979ef 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/udp.h> | 38 | #include <linux/udp.h> |
| 39 | #include <linux/ethtool.h> | 39 | #include <linux/ethtool.h> |
| 40 | #include <linux/wait.h> | 40 | #include <linux/wait.h> |
| 41 | #include <asm/system.h> | ||
| 42 | #include <asm/div64.h> | 41 | #include <asm/div64.h> |
| 43 | #include <linux/highmem.h> | 42 | #include <linux/highmem.h> |
| 44 | #include <linux/netfilter_bridge.h> | 43 | #include <linux/netfilter_bridge.h> |