commit 63270360c7a75b65ece5be976f732e7322fd1362
author Matthias Kaehlcke <mka@google.com> Sat Jul 25 02:07:44 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jul 25 02:07:44 2015 +0000
tree 952681911e3c081af929f1eb9ab2e8dd9b7cbc5f
parent 9b2eb76cc0cab57dba348fc5532fed44c538a41c
parent 6968fce62ed71e2af11a858ddd99b6b1a7d61ac1

Merge "Fix uloader build"

arch/arm/boards/optimus/optimus.c

diff --git a/arch/arm/boards/optimus/optimus.c b/arch/arm/boards/optimus/optimus.c
index 43554e1..d452cfa 100644
--- a/arch/arm/boards/optimus/optimus.c
+++ b/arch/arm/boards/optimus/optimus.c
@@ -61,11 +61,11 @@
 
 #define SPACECAST_TPM_I2C_ADDR		0x20
 
+static bool recovery_mode = false;
+
 #ifdef CONFIG_SPI
 //Legacy spi
 
-static bool recovery_mode = false;
-
 static int c2k_spi_cs[4] = {0};
 
 static struct c2k_spi_master c2k_spi_1_data = {
@@ -334,7 +334,7 @@
 	return 1;
 }
 
-int is_recovery_mode() {
+int is_recovery_mode(void) {
 	return recovery_mode;
 }