From: Michal Simek <monstr@monstr.eu>
Date: Mon, 24 Sep 2012 09:27:06 +0000 (+0200)
Subject: spi: Fix compilation failures
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01233b12bf9fadb9704dbc04961ed6faee116b7e;p=thirdparty%2Fu-boot.git

spi: Fix compilation failures

Signed-off-by: Michal Simek <monstr@monstr.eu>
---

diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index 408caa99581..e9ff45b41b7 100755
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -196,7 +196,7 @@ typedef enum irqreturn irqreturn_t;
 #else
 static inline
 u32 xqspips_read(void *addr)
-{					
+{
 	u32 val;
 
 	val =  XIo_In32((unsigned)addr);
@@ -1384,7 +1384,8 @@ int xqspips_check_is_dual_flash(void __iomem *regs_base)
 {
 	int is_dual = -1, lower_mio = 0, upper_mio = 0, val;
 	u16 mask = 3, type = 2;
-	u32 mio_base, mio_pin_index;
+	u32 mio_pin_index;
+	void *mio_base;
 
 #ifdef CONFIG_EP107
 #ifdef CONFIG_XILINX_PSS_QSPI_USE_DUAL_FLASH