diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-09 15:52:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-09 15:52:30 -0400 |
| commit | 90494cc567319cd53574306f3b94fb3c7ff8fe88 (patch) | |
| tree | e112fa35cf4231af34ed9cada413b0c624469d0f /drivers | |
| parent | 5ebe5500fb808c9079ec81a7841482c72d30de56 (diff) | |
| parent | 7f20caff0ef6ce87dbb044389d43bfa1093cd3af (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/iscsi_ibft_find.c | 2 |
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: | |||
| 108 | */ | 108 | */ |
| 109 | unsigned long __init find_ibft_region(unsigned long *sizep) | 109 | unsigned long __init find_ibft_region(unsigned long *sizep) |
| 110 | { | 110 | { |
| 111 | #ifdef CONFIG_ACPI | ||
| 111 | int i; | 112 | int i; |
| 113 | #endif | ||
| 112 | ibft_addr = NULL; | 114 | ibft_addr = NULL; |
| 113 | 115 | ||
| 114 | #ifdef CONFIG_ACPI | 116 | #ifdef CONFIG_ACPI |