diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
| commit | 61816596d1c9026d0ecb20c44f90452c41596ffe (patch) | |
| tree | 3027ed6dc62f71e14b9d525405747fa0eb8f074d /tools | |
| parent | 23a9072e3af0d9538e25837fb2b56bb94e4a8e67 (diff) | |
| parent | da2191e31409d1058dcbed44e8f53e39a40e86b3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get Daniel Borkmann's flow dissector
infrastructure change.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/usb/ffs-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/usb/ffs-test.c b/tools/usb/ffs-test.c index 8674b9ec14f6..fe1e66b6ef40 100644 --- a/tools/usb/ffs-test.c +++ b/tools/usb/ffs-test.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include <unistd.h> | 38 | #include <unistd.h> |
| 39 | #include <tools/le_byteshift.h> | 39 | #include <tools/le_byteshift.h> |
| 40 | 40 | ||
| 41 | #include "../../include/linux/usb/functionfs.h" | 41 | #include "../../include/uapi/linux/usb/functionfs.h" |
| 42 | 42 | ||
| 43 | 43 | ||
| 44 | /******************** Little Endian Handling ********************************/ | 44 | /******************** Little Endian Handling ********************************/ |