diff options
author | Shawn Nematbakhsh <shawnn@google.com> | 2015-11-07 15:17:11 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2015-11-08 17:31:11 -0800 |
commit | 6f4595ff7ac0821c9e4a4097444e6838e33b52c1 (patch) | |
tree | 86dd5f6fd1f28c8cc1b725c4f36941704fabdd13 /include | |
parent | 2d26ba2d24a4856557dc3cabf1162bd50d4cd6f5 (diff) | |
download | chrome-ec-6f4595ff7ac0821c9e4a4097444e6838e33b52c1.tar.gz |
cleanup: Rename usb.h to usb_descriptor.h
Rename usb.h to usb_descriptor.h to prevent conflict with a
commonly-used libusb header.
BUG=chromium:552006
BRANCH=None
TEST=`make buildall -j`
Change-Id: I6145ce120e1fda41bc5c4d4da0313272e76839c7
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/311429
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/usb_descriptor.h (renamed from include/usb.h) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/usb.h b/include/usb_descriptor.h index 88b6d27676..62dfe093e1 100644 --- a/include/usb.h +++ b/include/usb_descriptor.h @@ -5,8 +5,8 @@ * USB definitions. */ -#ifndef __CROS_EC_USB_H -#define __CROS_EC_USB_H +#ifndef __CROS_EC_USB_DESCRIPTOR_H +#define __CROS_EC_USB_DESCRIPTOR_H #include <stddef.h> /* for wchar_t */ @@ -244,4 +244,4 @@ extern const uint8_t usb_string_desc[]; extern const void * const usb_fw_version; extern const struct bos_context bos_ctx; -#endif /* __CROS_EC_USB_H */ +#endif /* __CROS_EC_USB_DESCRIPTOR_H */ |