From 6f4595ff7ac0821c9e4a4097444e6838e33b52c1 Mon Sep 17 00:00:00 2001 From: Shawn Nematbakhsh Date: Sat, 7 Nov 2015 15:17:11 -0800 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/311429 Commit-Ready: Shawn N Tested-by: Shawn N Reviewed-by: Alec Berg --- board/dingdong/board.c | 2 +- board/dingdong/usb_pd_policy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'board/dingdong') diff --git a/board/dingdong/board.c b/board/dingdong/board.c index 2896135389..5091494dfb 100644 --- a/board/dingdong/board.c +++ b/board/dingdong/board.c @@ -11,8 +11,8 @@ #include "gpio.h" #include "hooks.h" #include "registers.h" -#include "usb.h" #include "usb_bb.h" +#include "usb_descriptor.h" #include "usb_pd.h" #include "task.h" #include "timer.h" diff --git a/board/dingdong/usb_pd_policy.c b/board/dingdong/usb_pd_policy.c index 69d7f2d811..39980f6abf 100644 --- a/board/dingdong/usb_pd_policy.c +++ b/board/dingdong/usb_pd_policy.c @@ -14,8 +14,8 @@ #include "task.h" #include "timer.h" #include "util.h" -#include "usb.h" #include "usb_bb.h" +#include "usb_descriptor.h" #include "usb_pd.h" #include "version.h" -- cgit v1.2.1