From 49600087b975f5f2df77c3b5c0505d5a7aedcb0a Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sun, 8 Jan 2012 16:21:41 +0100
Subject: rename 'struct dfu' to 'struct dfudata' and 'dfu' symbol to 'g_dfu'

This avoids clashes with the -Ddfu caused by board MEMORIES
---
 usb/device/dfu/dfu.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usb/device/dfu/dfu.h')

diff --git a/usb/device/dfu/dfu.h b/usb/device/dfu/dfu.h
index 3cbcac5..ad64c99 100644
--- a/usb/device/dfu/dfu.h
+++ b/usb/device/dfu/dfu.h
@@ -112,14 +112,14 @@ const USBDDriverDescriptors dfu_descriptors;
 
 /* The API between the core DFU handler and the board/soc specific code */
 
-struct dfu {
+struct dfudata {
 	uint8_t status;
 	uint32_t state;
 	int past_manifest;
 	unsigned int total_bytes;
 };
 
-extern struct dfu dfu;
+extern struct dfudata g_dfu;
 void set_usb_serial_str(const uint8_t *serial_usbstr);
 
 /* call-backs by the board/SOC */
-- 
cgit v1.2.3