diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-08 15:39:22 -0400 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-08 15:39:22 -0400 |
| commit | 7c91d302ffe2ffac813c47d6ba2e7489a2ccb35f (patch) | |
| tree | 78a2cf601e986694765b28079bf749a8eaa6a2b9 /tools | |
| parent | 0b824f8dad9fdfc7c1bf9c1d3ac744075eb73ec6 (diff) | |
| parent | 918d7f6f68620e0721bb31402ebf87e15f826831 (diff) | |
Merge remote-tracking branch 'clk/clk-for-3.10' into sunxi/core-for-3.10
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 ********************************/ |