commit 98f847b5b09849ef951bde93b3cf72c645f016eb
author John Newlin <jnewlin@google.com> Thu Oct 02 21:07:22 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 02 21:07:22 2014 +0000
tree 7c7d3b75a8a22f7d4186b84a78ba083605abcba2
parent 8fd3e9051ac7113f0d0b837c8c9b66c640c1c318
parent acc0f69f7afb70d1e240d4c8e594950c571ca762

Merge "Fix for elif."

arch/arm/mach-comcerto/include/mach/uncompress.h

diff --git a/arch/arm/mach-comcerto/include/mach/uncompress.h b/arch/arm/mach-comcerto/include/mach/uncompress.h
index f3f0c4b..0467af0 100644
--- a/arch/arm/mach-comcerto/include/mach/uncompress.h
+++ b/arch/arm/mach-comcerto/include/mach/uncompress.h
@@ -24,7 +24,7 @@
 #ifdef CONFIG_COMCERTO_UART1_SUPPORT
 	#define UART_DR		(*(volatile unsigned long *)0x96400000)
 	#define UART_LSR	(*(volatile unsigned long *)0x96400014)
-#elif CONFIG_COMCERTO_UART0_SUPPORT
+#elif defined(CONFIG_COMCERTO_UART0_SUPPORT)
 	#define UART_DR		(*(volatile unsigned long *)0x96300000)
 	#define UART_LSR	(*(volatile unsigned long *)0x96300014)
 #else