diff --git a/[refs] b/[refs]
index c1b36dec2063..0b7cf9ef1df6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e6c647ed9994428643e7e740b2d8241ee13da5c
+refs/heads/master: 049645d753e39cb64c8563faf865b0689256cf28
diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig
index 1e4719790a94..9e00c389e777 100644
--- a/trunk/drivers/power/Kconfig
+++ b/trunk/drivers/power/Kconfig
@@ -348,6 +348,7 @@ config AB8500_BM
 
 config BATTERY_GOLDFISH
 	tristate "Goldfish battery driver"
+	depends on GENERIC_HARDIRQS
 	help
 	  Say Y to enable support for the battery and AC power in the
 	  Goldfish emulator.