From: Konrad Rzeszutek Wilk <konrad@kernel.org>
Date: Tue, 7 Jun 2011 14:27:34 +0000 (-0400)
Subject: iscsi-ibft: Fix compile warning introduced by 'iscsi_ibft: iscsi_ibft_find unused... 
X-Git-Tag: next-20110726~41^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f1b1e067b999aa141229a2a524b7be080f999795;p=karo-tx-linux.git

iscsi-ibft: Fix compile warning introduced by 'iscsi_ibft: iscsi_ibft_find unused variable i'

which appear if CONFIG_ACPI is defined (the previous patch
was trying to fix when CONFIG_ACPI was not defined). The warning is:

drivers/firmware/iscsi_ibft_find.c: In function 'find_ibft_region':
drivers/firmware/iscsi_ibft_find.c:114:2: warning: ISO C90 forbids mixed declarations and code

Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
---

diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
index c2bfa5016bd3..bfe723266fd8 100644
--- a/drivers/firmware/iscsi_ibft_find.c
+++ b/drivers/firmware/iscsi_ibft_find.c
@@ -108,10 +108,12 @@ done:
  */
 unsigned long __init find_ibft_region(unsigned long *sizep)
 {
+#ifdef CONFIG_ACPI
+	int i;
+#endif
 	ibft_addr = NULL;
 
 #ifdef CONFIG_ACPI
-	int i;
 	for (i = 0; i < ARRAY_SIZE(ibft_signs) && !ibft_addr; i++)
 		acpi_table_parse(ibft_signs[i].sign, acpi_find_ibft);
 #endif /* CONFIG_ACPI */