]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
iscsi-ibft: Fix compile warning introduced by 'iscsi_ibft: iscsi_ibft_find unused...
authorKonrad Rzeszutek Wilk <konrad@kernel.org>
Tue, 7 Jun 2011 14:27:34 +0000 (10:27 -0400)
committerKonrad Rzeszutek Wilk <konrad@kernel.org>
Tue, 7 Jun 2011 14:40:18 +0000 (10:40 -0400)
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>
drivers/firmware/iscsi_ibft_find.c

index c2bfa5016bd329b3e9942559aeb6ce6336e92853..bfe723266fd89bb84726d88cf15c206c020ee707 100644 (file)
@@ -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 */