summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-09 21:52:30 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-09 21:52:30 +0200
commit90494cc567319cd53574306f3b94fb3c7ff8fe88 (patch)
treee112fa35cf4231af34ed9cada413b0c624469d0f
parentMerge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epi... (diff)
parentiscsi_ibft: iscsi_ibft_find unused variable i (diff)
downloadlinux-90494cc567319cd53574306f3b94fb3c7ff8fe88.tar.xz
linux-90494cc567319cd53574306f3b94fb3c7ff8fe88.zip
Merge branch 'stable/broadcom.ibft-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6
* '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
-rw-r--r--drivers/firmware/iscsi_ibft_find.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
index f032e446fc11..bfe723266fd8 100644
--- a/drivers/firmware/iscsi_ibft_find.c
+++ b/drivers/firmware/iscsi_ibft_find.c
@@ -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