git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth
[pandora-kernel.git]
/
drivers
/
firmware
/
iscsi_ibft_find.c
diff --git
a/drivers/firmware/iscsi_ibft_find.c
b/drivers/firmware/iscsi_ibft_find.c
index
f032e44
..
bfe7232
100644
(file)
--- 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