Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 0196acf05231d1dff40e8f7917599ff176e01d48..ba6975123071984b88195d3acbce7a6d5e79d8f7 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -384,6 +384,7 @@ config AB8500_BM
 config BATTERY_GOLDFISH
        tristate "Goldfish battery driver"
        depends on GOLDFISH || COMPILE_TEST
+       depends on HAS_IOMEM
        help
          Say Y to enable support for the battery and AC power in the
          Goldfish emulator.