diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-06-16 13:23:15 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-06-16 13:23:22 +0200 |
commit | b4f9f2b64aa189c5584f266f4f0343af7a705441 (patch) | |
tree | f410718bb93590ff61682b566c10f70d5883bbcd /drivers/firmware/iscsi_ibft_find.c | |
parent | 76369139ceb955deefc509e6e12ce9d6ce50ccab (diff) | |
parent | 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff) |
Merge commit 'v3.0-rc3' into perf/core
Merge reason: add the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/firmware/iscsi_ibft_find.c')
-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 f032e446fc1..bfe723266fd 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 |