diff options
| author | Erik Gilling <konkers@android.com> | 2010-12-09 15:53:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-09 15:53:03 -0800 |
| commit | 67ebdce9821d33c41c8bd5cd8bf6259cc82db0cb (patch) | |
| tree | a0e03c0f3fc79f47a7a59dcade76507801e75843 /include | |
| parent | 8d758271d4c4ec72e645691a4b9df18014b5aef1 (diff) | |
| parent | 3af05b09eb116e48997a2d4611b0a1e033737d2e (diff) | |
| download | system_core-67ebdce9821d33c41c8bd5cd8bf6259cc82db0cb.zip system_core-67ebdce9821d33c41c8bd5cd8bf6259cc82db0cb.tar.gz system_core-67ebdce9821d33c41c8bd5cd8bf6259cc82db0cb.tar.bz2 | |
Merge changes I4dcadf8e,I166d2859
* changes:
libusbhost: add usb chapter 9 include to usbhost.h
toolbox: add lsusb command
Diffstat (limited to 'include')
| -rw-r--r-- | include/usbhost/usbhost.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/usbhost/usbhost.h b/include/usbhost/usbhost.h index f7cc52e..5332acd 100644 --- a/include/usbhost/usbhost.h +++ b/include/usbhost/usbhost.h @@ -23,6 +23,13 @@ extern "C" { #include <stdint.h> +#include <linux/version.h> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 20) +#include <linux/usb/ch9.h> +#else +#include <linux/usb_ch9.h> +#endif + struct usb_host_context; struct usb_endpoint_descriptor; |