Merge branch 'stable/broadcom.ibft-bugfixes' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jun 2011 19:52:30 +0000 (12:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jun 2011 19:52:30 +0000 (12:52 -0700)
* 'stable/broadcom.ibft-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6:
  iscsi_ibft: iscsi_ibft_find unused variable i

drivers/firmware/iscsi_ibft_find.c

index f032e446fc11bb8a0c943e519b0987c8cdd02d01..bfe723266fd89bb84726d88cf15c206c020ee707 100644 (file)
@@ -108,7 +108,9 @@ done:
  */
 unsigned long __init find_ibft_region(unsigned long *sizep)
 {
+#ifdef CONFIG_ACPI
        int i;
+#endif
        ibft_addr = NULL;
 
 #ifdef CONFIG_ACPI