diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 14:57:39 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 14:57:39 -0600 |
| commit | 2bc7c85210d75b7a8a7326284b4f608a16f52ffc (patch) | |
| tree | ca306d89f64ceeee92531cc0a9ba5d246d09f044 /drivers/firmware/iscsi_ibft_find.c | |
| parent | 12610be33df5563d3f8cb141f231d4dc5b2a317f (diff) | |
| parent | df2212270ce94f12e9caed6ca04c7077672d588e (diff) | |
Merge branch 'gpio/next-tegra' into gpio/next
Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile
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 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 |