aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-10-21 18:15:03 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-10-21 18:17:09 -0400
commit4e713b113857b02d3f61d55c3e1e99a2532498bb (patch)
tree09550084b8ffd51a877517a7a03cca4cf08deb61 /libmaple
parent29ddb1e6bdd86284b7876b3cd1a4cb54c7eb1bd7 (diff)
downloadlibrambutan-4e713b113857b02d3f61d55c3e1e99a2532498bb.tar.gz
librambutan-4e713b113857b02d3f61d55c3e1e99a2532498bb.zip
usb: Rename descriptors.h -> usb_descriptors.h.
Modify its include guard, and the files that include it, appropriately. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libmaple')
-rw-r--r--libmaple/usb/usb_cdcacm.c2
-rw-r--r--libmaple/usb/usb_descriptors.h (renamed from libmaple/usb/descriptors.h)4
2 files changed, 3 insertions, 3 deletions
diff --git a/libmaple/usb/usb_cdcacm.c b/libmaple/usb/usb_cdcacm.c
index a86776b..b41753a 100644
--- a/libmaple/usb/usb_cdcacm.c
+++ b/libmaple/usb/usb_cdcacm.c
@@ -37,7 +37,7 @@
#include "delay.h"
#include "usb.h"
-#include "descriptors.h"
+#include "usb_descriptors.h"
#include "usb_lib_globals.h"
#include "usb_reg_map.h"
diff --git a/libmaple/usb/descriptors.h b/libmaple/usb/usb_descriptors.h
index 06d9ce7..535713b 100644
--- a/libmaple/usb/descriptors.h
+++ b/libmaple/usb/usb_descriptors.h
@@ -22,8 +22,8 @@
* THE SOFTWARE.
* ****************************************************************************/
-#ifndef __DESCRIPTORS_H
-#define __DESCRIPTORS_H
+#ifndef _USB_DESCRIPTORS_H_
+#define _USB_DESCRIPTORS_H_
#include "libmaple.h"