From c8bb8b69ee727c8cf749fb6007417c32dd8f7459 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Thu, 19 Mar 2009 13:33:52 +0100
Subject: [PATCH] --- yaml --- r: 136159 b: refs/heads/master c:
 1bf68e5cda40eaa26b186f043340fd283a4fb718 h: refs/heads/master i:   136157:
 4629543ab606a1e6cb6596e90ad272819ddb83c4   136155:
 30349b1e5d97d8462141ae94b3deb5763da1e554   136151:
 cc353af4b0e863783a42888a637a55d2d9e0445e   136143:
 5b6428bb2b7fdcaf3b40deca3f451e302f0a3d26   136127:
 4cd60715b67df2803e719d094e93ca368236ae38 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/wireless/p54/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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