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 /chip/g/usb_console.c | |
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 'chip/g/usb_console.c')
-rw-r--r-- | chip/g/usb_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chip/g/usb_console.c b/chip/g/usb_console.c index d075bdac09..1414ddbe1e 100644 --- a/chip/g/usb_console.c +++ b/chip/g/usb_console.c @@ -12,7 +12,7 @@ #include "task.h" #include "timer.h" #include "util.h" -#include "usb.h" +#include "usb_descriptor.h" /* Console output macro */ #define CPRINTF(format, args...) cprintf(CC_USB, format, ## args) |