From 00175d9cf313aea3728b26531f90c02de561f2b5 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 21 Jul 2016 09:13:47 -0600
Subject: [PATCH] Version b28bf6... of apps/canutils/libcanard must not be
 patched due to moving can.h

---
 canutils/libcanard/Makefile                           |  4 ++++
 ...ttx-b28bf6ac337e55d49037fd9904d4b951760c4690.patch | 11 +++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 canutils/libcanard/nuttx-b28bf6ac337e55d49037fd9904d4b951760c4690.patch

diff --git a/canutils/libcanard/Makefile b/canutils/libcanard/Makefile
index 35756c3f2..57a065432 100644
--- a/canutils/libcanard/Makefile
+++ b/canutils/libcanard/Makefile
@@ -46,6 +46,7 @@ LIBCANARD_UNPACKNAME = libcanard-$(LIBCANARD_VERSION)
 LIBCANARD_PACKNAME = $(LIBCANARD_UNPACKNAME)$(PACKEXT)
 LIBCANARD_SRCDIR = $(LIBCANARD_UNPACKNAME)
 LIBCANARD_DRVDIR = $(LIBCANARD_SRCDIR)$(DELIM)drivers$(DELIM)nuttx
+LIBCANARD_PATCHNAME = nuttx-$(LIBCANARD_VERSION).patch
 
 APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)canutils
 
@@ -78,6 +79,9 @@ $(LIBCANARD_UNPACKNAME): $(LIBCANARD_PACKNAME)
 	@echo "Unpacking: $< -> $@"
 	$(call DELDIR, $@)
 	$(Q) $(UNPACK) $<
+	$(Q) if [ -r $(LIBCANARD_PATCHNAME) ]; then \
+		cat $(LIBCANARD_PATCHNAME) | patch -p0 || { echo "ERROR: Patch failed"; exit 1; }; \
+		fi
 	$(Q) touch $@
 
 $(LIBCANARD_SRCDIR)$(DELIM)canard.h: $(LIBCANARD_UNPACKNAME)
diff --git a/canutils/libcanard/nuttx-b28bf6ac337e55d49037fd9904d4b951760c4690.patch b/canutils/libcanard/nuttx-b28bf6ac337e55d49037fd9904d4b951760c4690.patch
new file mode 100644
index 000000000..92f5302ac
--- /dev/null
+++ b/canutils/libcanard/nuttx-b28bf6ac337e55d49037fd9904d4b951760c4690.patch
@@ -0,0 +1,11 @@
+--- libcanard-b28bf6ac337e55d49037fd9904d4b951760c4690/drivers/nuttx/canard_nuttx.c.orig	2016-07-21 09:10:10.781658371 -0600
++++ libcanard-b28bf6ac337e55d49037fd9904d4b951760c4690/drivers/nuttx/canard_nuttx.c	2016-07-21 09:10:26.608658284 -0600
+@@ -10,7 +10,7 @@
+ #include <poll.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <nuttx/can.h>
++#include <nuttx/drivers/can.h>
+ 
+ int canardNuttXInit(CanardNuttXInstance* out_ins, const char* can_iface_name)
+ {