Skip to content

Commit

Permalink
Merge branch 'stable/broadcom.ibft-bugfixes' of git://git.kernel.org/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Linus Torvalds committed Jun 9, 2011
2 parents 5ebe550 + 7f20caf commit 90494cc
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/firmware/iscsi_ibft_find.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ static int __init find_ibft_in_mem(void)
*/
unsigned long __init find_ibft_region(unsigned long *sizep)
{
#ifdef CONFIG_ACPI
int i;
#endif
ibft_addr = NULL;

#ifdef CONFIG_ACPI
Expand Down

0 comments on commit 90494cc

Please sign in to comment.