diff --git a/LUFA.pnproj b/LUFA.pnproj index a384f7bf75..c2426bda71 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.h b/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.h index 731f2815f6..315a4e2171 100644 --- a/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.h +++ b/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.h @@ -46,8 +46,8 @@ * @{ */ -#ifndef __ENDPOINT_STREAM_H__ -#define __ENDPOINT_STREAM_H__ +#ifndef __ENDPOINT_STREAM_UC3_H__ +#define __ENDPOINT_STREAM_UC3_H__ /* Includes: */ #include "../../../../Common/Common.h" diff --git a/Projects/makefile b/Projects/makefile index b5325f66de..531c52ec85 100644 --- a/Projects/makefile +++ b/Projects/makefile @@ -26,8 +26,8 @@ all: $(MAKE) -C Magstripe clean $(MAKE) -C Magstripe all - $(MAKE) -C MediaControl clean - $(MAKE) -C MediaControl all + $(MAKE) -C MediaController clean + $(MAKE) -C MediaController all $(MAKE) -C MIDIToneGenerator clean $(MAKE) -C MIDIToneGenerator all @@ -55,7 +55,7 @@ all: $(MAKE) -C Benito $@ $(MAKE) -C LEDNotifier $@ $(MAKE) -C Magstripe $@ - $(MAKE) -C MediaControl $@ + $(MAKE) -C MediaController $@ $(MAKE) -C MissileLauncher $@ $(MAKE) -C RelayBoard $@ $(MAKE) -C TempDataLogger $@