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 /board/twinkie | |
| 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 'board/twinkie')
| -rw-r--r-- | board/twinkie/board.c | 2 | ||||
| -rw-r--r-- | board/twinkie/sniffer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/twinkie/board.c b/board/twinkie/board.c index efdf16d7b7..513d45d9a7 100644 --- a/board/twinkie/board.c +++ b/board/twinkie/board.c @@ -15,7 +15,7 @@ #include "ina2xx.h" #include "registers.h" #include "task.h" -#include "usb.h" +#include "usb_descriptor.h" #include "util.h" void cc2_event(enum gpio_signal signal) diff --git a/board/twinkie/sniffer.c b/board/twinkie/sniffer.c index 86bbc7ee54..77eefb20f9 100644 --- a/board/twinkie/sniffer.c +++ b/board/twinkie/sniffer.c @@ -16,7 +16,7 @@ #include "registers.h" #include "task.h" #include "timer.h" -#include "usb.h" +#include "usb_descriptor.h" #include "util.h" #include "ina2xx.h" |