From beb6ad2e401ba4d1c5a9540fa912831bd49fe30d Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Mon, 2 Apr 2018 21:37:44 -0400
Subject: [PATCH] Add USB HID support, including Consumer Control

---
 ports/atmel-samd/Makefile | 2 ++
 tools/usb_descriptor      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 39625ad959..16f789c523 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -72,6 +72,7 @@ BASE_CFLAGS = \
 	-Wnested-externs \
 	-Wunreachable-code \
 	-Wcast-align \
+	-Wno-error=lto-type-mismatch \
 	-D__$(CHIP_VARIANT)__ \
 	-ffunction-sections \
 	-fdata-sections \
@@ -81,6 +82,7 @@ BASE_CFLAGS = \
 	-DCIRCUITPY_SAFE_RESTART_WORD=0xDEADBEEF \
 	--param max-inline-insns-single=500
 
+
 # NDEBUG disables assert() statements. This reduces code size pretty dramatically, per tannewt.
 
 ifeq ($(CHIP_FAMILY), samd21)
diff --git a/tools/usb_descriptor b/tools/usb_descriptor
index 2edd94c50b..1ad93335ef 160000
--- a/tools/usb_descriptor
+++ b/tools/usb_descriptor
@@ -1 +1 @@
-Subproject commit 2edd94c50b67ac2acc665a5b06e34c2625a8f622
+Subproject commit 1ad93335ef3b41c473612eb49b6cf81f69555797