diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/veth.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/veth.h')
| -rw-r--r-- | include/linux/veth.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/veth.h b/include/linux/veth.h deleted file mode 100644 index 3354c1eb424e..000000000000 --- a/include/linux/veth.h +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | #ifndef __NET_VETH_H_ | ||
| 2 | #define __NET_VETH_H_ | ||
| 3 | |||
| 4 | enum { | ||
| 5 | VETH_INFO_UNSPEC, | ||
| 6 | VETH_INFO_PEER, | ||
| 7 | |||
| 8 | __VETH_INFO_MAX | ||
| 9 | #define VETH_INFO_MAX (__VETH_INFO_MAX - 1) | ||
| 10 | }; | ||
| 11 | |||
| 12 | #endif | ||