summaryrefslogtreecommitdiff
path: root/chip/stm32/usb_spi.h
diff options
context:
space:
mode:
authorShawn Nematbakhsh <shawnn@google.com>2015-11-07 15:17:11 -0800
committerchrome-bot <chrome-bot@chromium.org>2015-11-08 17:31:11 -0800
commit6f4595ff7ac0821c9e4a4097444e6838e33b52c1 (patch)
tree86dd5f6fd1f28c8cc1b725c4f36941704fabdd13 /chip/stm32/usb_spi.h
parent2d26ba2d24a4856557dc3cabf1162bd50d4cd6f5 (diff)
downloadchrome-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/stm32/usb_spi.h')
-rw-r--r--chip/stm32/usb_spi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chip/stm32/usb_spi.h b/chip/stm32/usb_spi.h
index 615bbf663e..5395e9530f 100644
--- a/chip/stm32/usb_spi.h
+++ b/chip/stm32/usb_spi.h
@@ -9,7 +9,7 @@
#include "compile_time_macros.h"
#include "hooks.h"
-#include "usb.h"
+#include "usb_descriptor.h"
/*
* Command: