diff --git a/[refs] b/[refs]
index ec90e367f8c1..5acc8618d68f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 636a5d3625993c5ca59abc81794b9ded93cdb740
+refs/heads/master: 1bf68e5cda40eaa26b186f043340fd283a4fb718
diff --git a/trunk/drivers/net/wireless/p54/Kconfig b/trunk/drivers/net/wireless/p54/Kconfig
index cfc5f41aa136..0e344ac10d2c 100644
--- a/trunk/drivers/net/wireless/p54/Kconfig
+++ b/trunk/drivers/net/wireless/p54/Kconfig
@@ -64,7 +64,7 @@ config P54_PCI
 
 config P54_SPI
 	tristate "Prism54 SPI (stlc45xx) support"
-	depends on P54_COMMON && SPI_MASTER
+	depends on P54_COMMON && SPI_MASTER && GENERIC_HARDIRQS
 	---help---
 	  This driver is for stlc4550 or stlc4560 based wireless chips.
 	  This driver is experimental, untested and will probably only work on